Skip to content

Commit

Permalink
Updated gstreamer dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Bauer committed Oct 21, 2015
1 parent e7d51fb commit a227970
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Arrays;
import java.util.logging.Level;

public class MediaRendererController extends MainController {
Expand Down Expand Up @@ -118,14 +119,12 @@ public void run() {
MediaRenderer.APP.log(Level.INFO, "Initializing GStreamer backend and registering MediaRenderer device...");

try {
fullscreenCheckbox.setSelected(
args.length != 1 || !args[0].equals(ARG_USE_WINDOWS)
);

// Pick a display method
DisplayHandler displayHandler = args.length == 1 && args[0].equals(ARG_USE_WINDOWS)
? new WindowedDisplayHandler()
: new FullscreenDisplayHandler();
boolean fullscreen = args == null || !Arrays.asList(args).contains(ARG_USE_WINDOWS);
fullscreenCheckbox.setSelected(fullscreen);
DisplayHandler displayHandler = fullscreen
? new FullscreenDisplayHandler()
: new WindowedDisplayHandler();

// Initialize the GStreamer backend (this also sets log level to WARNING for org.gstreamer)
Gst.init(MediaRenderer.APPNAME, args);
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<ejb.api.version>3.0</ejb.api.version>
<slf4j.version>1.7.12</slf4j.version>
<jna.version>3.2.5</jna.version>
<gstreamer.version>1.4</gstreamer.version>
<gstreamer.version>1.5</gstreamer.version>
<args4j.version>2.0.12</args4j.version>
<weld.version>1.1.10.Final</weld.version>
<javassist.version>3.19.0-GA</javassist.version>
Expand Down

0 comments on commit a227970

Please sign in to comment.