diff --git a/src/main/java/eu/over9000/skadi/handler/StreamHandler.java b/src/main/java/eu/over9000/skadi/handler/StreamHandler.java index 7ffd495..0136fa5 100644 --- a/src/main/java/eu/over9000/skadi/handler/StreamHandler.java +++ b/src/main/java/eu/over9000/skadi/handler/StreamHandler.java @@ -88,10 +88,9 @@ private StreamProcessHandler(final Channel forChannel, final StreamQuality quali channel = forChannel; thread.setName("StreamHandler Thread for " + channel.getName()); - final String videoplayerExec = StateContainer.getInstance().getExecutableVideoplayer(); final String livestreamerExec = StateContainer.getInstance().getExecutableLivestreamer(); - process = new ProcessBuilder(livestreamerExec, channel.buildURL(), quality.getQuality(), "-p " + videoplayerExec).redirectErrorStream(true).start(); + process = new ProcessBuilder(livestreamerExec, channel.buildURL(), quality.getQuality()).redirectErrorStream(true).start(); thread.start(); } diff --git a/src/main/java/eu/over9000/skadi/model/StateContainer.java b/src/main/java/eu/over9000/skadi/model/StateContainer.java index 08a35bd..50ebe81 100644 --- a/src/main/java/eu/over9000/skadi/model/StateContainer.java +++ b/src/main/java/eu/over9000/skadi/model/StateContainer.java @@ -41,8 +41,6 @@ public final class StateContainer { private String executableChrome = getDefaultChrome(); @XmlElement(name = "executable_livestreamer") private String executableLivestreamer = getDefaultLivestreamer(); - @XmlElement(name = "executable_videoplayer") - private String executableVideoplayer = getDefaultVideoplayer(); @XmlElement(name = "display_notifications") private boolean displayNotifications = true; @XmlElement(name = "minimize_to_tray") @@ -108,14 +106,6 @@ public void setExecutableLivestreamer(final String executableLivestreamer) { this.executableLivestreamer = executableLivestreamer; } - public String getExecutableVideoplayer() { - return executableVideoplayer; - } - - public void setExecutableVideoplayer(final String executableVideoplayer) { - this.executableVideoplayer = executableVideoplayer; - } - public boolean isDisplayNotifications() { return displayNotifications; } diff --git a/src/main/java/eu/over9000/skadi/ui/dialogs/SettingsDialog.java b/src/main/java/eu/over9000/skadi/ui/dialogs/SettingsDialog.java index 0112b1f..1ada5bd 100644 --- a/src/main/java/eu/over9000/skadi/ui/dialogs/SettingsDialog.java +++ b/src/main/java/eu/over9000/skadi/ui/dialogs/SettingsDialog.java @@ -45,9 +45,6 @@ public SettingsDialog() { final TextField tfLivestreamer = new TextField(state.getExecutableLivestreamer()); tfLivestreamer.setPrefColumnCount(25); - final Label lbVideoplayer = new Label("Videoplayer executable"); - final TextField tfVideoplayer = new TextField(state.getExecutableVideoplayer()); - tfVideoplayer.setPrefColumnCount(25); final Label lbChrome = new Label("Chrome executable"); final TextField tfChrome = new TextField(state.getExecutableChrome()); @@ -59,10 +56,8 @@ public SettingsDialog() { grid.add(lbLivestreamer, 0, 0); grid.add(tfLivestreamer, 1, 0); - grid.add(lbVideoplayer, 0, 1); - grid.add(tfVideoplayer, 1, 1); - grid.add(lbChrome, 0, 2); - grid.add(tfChrome, 1, 2); + grid.add(lbChrome, 0, 1); + grid.add(tfChrome, 1, 1); final CheckBox cbShowNotifications = new CheckBox("Show notifications"); cbShowNotifications.setSelected(state.isDisplayNotifications()); @@ -80,7 +75,6 @@ public SettingsDialog() { setResultConverter(btn -> { if (btn == saveButtonType) { state.setExecutableLivestreamer(tfLivestreamer.getText()); - state.setExecutableVideoplayer(tfVideoplayer.getText()); state.setExecutableChrome(tfChrome.getText()); state.setDisplayNotifications(cbShowNotifications.isSelected());