diff --git a/java/src/pm/Main.java b/java/src/pm/Main.java index 38f0f71..6f33feb 100644 --- a/java/src/pm/Main.java +++ b/java/src/pm/Main.java @@ -52,23 +52,23 @@ public class Main extends EventListener { } public void initialise() throws DeviceInitialiseException { - add(new JIntellitypeDevice()); + //add(new JIntellitypeDevice()); //add(new PlayerDevice()); add(new RumblepadDevice()); //add(new WiimoteDevice()); //add(new GUIDevice()); //add(new TextDevice()); - //add(new PanelDevice()); + add(new PanelDevice()); //add(new LanTextDevice()); //add(new Extreme3DDevice()); startDevices(); - //add(new ExampleApplication()); + add(new ExampleApplication()); //add(new WMPApplication()); //add(new GomPlayerApplication()); //add(new WinampApplication()); //add(new iTunesApplication()); - add(new VLCApplication()); + //add(new VLCApplication()); //add(new MPCApplication()); startApplications(); } diff --git a/java/src/pm/application/vlc/VLCApplication.java b/java/src/pm/application/vlc/VLCApplication.java index f659213..fb6026b 100644 --- a/java/src/pm/application/vlc/VLCApplication.java +++ b/java/src/pm/application/vlc/VLCApplication.java @@ -16,7 +16,7 @@ public class VLCApplication extends CMDApplication { protected static final int POSTION_CHANGE_RATE = 1; protected static final int VOLUME_CHANGE_RATE = 20; - protected static final String HOST = "192.168.1.105"; // localhost + protected static final String HOST = "127.0.0.1"; // localhost protected static final int PORT = 8080; protected Socket socket; PrintStream output; @@ -43,9 +43,9 @@ public class VLCApplication extends CMDApplication { } public void command(String command) { - String request = "GET /requests/status.xml?command=" + command + " /HTTP/1.1\r\n\n"; + //String request = "GET /requests/status.xml?command=" + command + " /HTTP/1.1\r\n\n"; output.println(request); - //System.out.printf("Kijk eens VLC: %s\n", request); + //System.out.printf("%s", request); /*System.out.println(request); try { Scanner feedback = new Scanner(socket.getInputStream()); @@ -68,6 +68,9 @@ public class VLCApplication extends CMDApplication { case PLAY: command("pl_pause"); break; + case PAUSE: + command("pl_pause"); + break; case NEXT: command("pl_next"); break; diff --git a/java/src/pm/device/panel/Panel.java b/java/src/pm/device/panel/Panel.java index 2f97ecc..b1c920a 100644 --- a/java/src/pm/device/panel/Panel.java +++ b/java/src/pm/device/panel/Panel.java @@ -36,14 +36,16 @@ public class Panel extends JFrame implements ChangeListener, HoldButtonListener protected JSlider positionSlider; protected JSlider volumeSlider; - protected JButton previousChapterButton; + protected JButton previousButton; protected JButton rewindButton; protected JButton stopButton; protected JButton pauseButton; protected JButton playButton; - protected JButton fastForwardButton; - protected JButton nextChapterButton; - protected JButton toggleMuteButton; + protected JButton forwardButton; + protected JButton nextButton; + protected JButton volumeDownButton; + protected JButton muteButton; + protected JButton volumeUpButton; protected boolean setPositionValue; Panel(PanelButtonListener panelButtonListener) { @@ -87,23 +89,25 @@ public class Panel extends JFrame implements ChangeListener, HoldButtonListener volumeSlider.setPreferredSize(new Dimension(100, 40)); volumeSlider.setToolTipText("Change volume"); - previousChapterButton = getButton("icons/control_start_blue.png", "Go to previous chapter"); - rewindButton = getButton("icons/control_rewind_blue.png", "Skip back"); - stopButton = getButton("icons/control_stop_blue.png", "Stop"); - pauseButton = getButton("icons/control_pause_blue.png", "Play/pause"); - playButton = getButton("icons/control_play_blue.png", "Play"); - fastForwardButton = getButton("icons/control_fastforward_blue.png", "Skip forward"); - nextChapterButton = getButton("icons/control_end_blue.png", "Go to next chapter"); - toggleMuteButton = getButton("icons/sound_mute.png", "Toggle Mute"); + previousButton = getButton("icons/previous.png", "Go to previous track"); + rewindButton = getButton("icons/rewind.png", "Skip backward"); + stopButton = getButton("icons/stop.png", "Stop"); + pauseButton = getButton("icons/pause.png", "Play/pause"); + playButton = getButton("icons/play.png", "Play/pause"); + forwardButton = getButton("icons/forward.png", "Skip forward"); + nextButton = getButton("icons/next.png", "Go to next track"); + volumeDownButton = getButton("icons/volumeDown.png", "Decrease volume"); + muteButton = getButton("icons/mute.png", "Toggle Mute"); + volumeUpButton = getButton("icons/volumeUp.png", "Increase volume"); } protected void layoutControls() { setLayout(new BorderLayout()); JPanel positionPanel = new JPanel(); - positionPanel.setLayout(new GridLayout(2, 1)); - positionPanel.add(positionProgressBar); - positionPanel.add(positionSlider); + positionPanel.setLayout(new GridLayout(1, 1)); // was 2, 1 + //positionPanel.add(positionProgressBar); + //positionPanel.add(positionSlider); JPanel topPanel = new JPanel(); topPanel.setLayout(new BorderLayout(8, 0)); @@ -116,20 +120,22 @@ public class Panel extends JFrame implements ChangeListener, HoldButtonListener JPanel bottomPanel = new JPanel(); bottomPanel.setLayout(new FlowLayout()); - bottomPanel.add(previousChapterButton); + bottomPanel.add(previousButton); bottomPanel.add(rewindButton); bottomPanel.add(stopButton); bottomPanel.add(pauseButton); bottomPanel.add(playButton); - bottomPanel.add(fastForwardButton); - bottomPanel.add(nextChapterButton); - bottomPanel.add(volumeSlider); - bottomPanel.add(toggleMuteButton); + bottomPanel.add(forwardButton); + bottomPanel.add(nextButton); + bottomPanel.add(volumeDownButton); + bottomPanel.add(muteButton); + bottomPanel.add(volumeUpButton); + //bottomPanel.add(volumeSlider); add(bottomPanel, BorderLayout.SOUTH); - positionSlider.addChangeListener(this); - volumeSlider.addChangeListener(this); + //positionSlider.addChangeListener(this); + //volumeSlider.addChangeListener(this); } /* Listeners */ @@ -146,8 +152,8 @@ public class Panel extends JFrame implements ChangeListener, HoldButtonListener } public void buttonPressed(HoldButton button) { - if (button.equals(previousChapterButton)) { - panelButtonListener.buttonPressed(PanelButton.PREVIOUS_CHAPTER); + if (button.equals(previousButton)) { + panelButtonListener.buttonPressed(PanelButton.PREVIOUS); } else if (button.equals(rewindButton)) { panelButtonListener.buttonPressed(PanelButton.REWIND); } else if (button.equals(stopButton)) { @@ -156,18 +162,22 @@ public class Panel extends JFrame implements ChangeListener, HoldButtonListener panelButtonListener.buttonPressed(PanelButton.PAUSE); } else if (button.equals(playButton)) { panelButtonListener.buttonPressed(PanelButton.PLAY); - } else if (button.equals(fastForwardButton)) { - panelButtonListener.buttonPressed(PanelButton.FAST_FORWARD); - } else if (button.equals(nextChapterButton)) { - panelButtonListener.buttonPressed(PanelButton.NEXT_CHAPTER); - } else if (button.equals(toggleMuteButton)) { - panelButtonListener.buttonPressed(PanelButton.TOGGLE_MUTE); + } else if (button.equals(forwardButton)) { + panelButtonListener.buttonPressed(PanelButton.FORWARD); + } else if (button.equals(nextButton)) { + panelButtonListener.buttonPressed(PanelButton.NEXT); + } else if (button.equals(volumeDownButton)) { + panelButtonListener.buttonPressed(PanelButton.VOLUME_DOWN); + } else if (button.equals(muteButton)) { + panelButtonListener.buttonPressed(PanelButton.MUTE); + } else if (button.equals(volumeUpButton)) { + panelButtonListener.buttonPressed(PanelButton.VOLUME_UP); } } public void buttonReleased(HoldButton button) { - if (button.equals(previousChapterButton)) { - panelButtonListener.buttonReleased(PanelButton.PREVIOUS_CHAPTER); + if (button.equals(previousButton)) { + panelButtonListener.buttonReleased(PanelButton.PREVIOUS); } else if (button.equals(rewindButton)) { panelButtonListener.buttonReleased(PanelButton.REWIND); } else if (button.equals(stopButton)) { @@ -176,12 +186,16 @@ public class Panel extends JFrame implements ChangeListener, HoldButtonListener panelButtonListener.buttonReleased(PanelButton.PAUSE); } else if (button.equals(playButton)) { panelButtonListener.buttonReleased(PanelButton.PLAY); - } else if (button.equals(fastForwardButton)) { - panelButtonListener.buttonReleased(PanelButton.FAST_FORWARD); - } else if (button.equals(nextChapterButton)) { - panelButtonListener.buttonReleased(PanelButton.NEXT_CHAPTER); - } else if (button.equals(toggleMuteButton)) { - panelButtonListener.buttonReleased(PanelButton.TOGGLE_MUTE); + } else if (button.equals(forwardButton)) { + panelButtonListener.buttonReleased(PanelButton.FORWARD); + } else if (button.equals(nextButton)) { + panelButtonListener.buttonReleased(PanelButton.NEXT); + } else if (button.equals(volumeDownButton)) { + panelButtonListener.buttonReleased(PanelButton.VOLUME_DOWN); + } else if (button.equals(muteButton)) { + panelButtonListener.buttonReleased(PanelButton.MUTE); + } else if (button.equals(volumeUpButton)) { + panelButtonListener.buttonReleased(PanelButton.VOLUME_UP); } } diff --git a/java/src/pm/device/panel/PanelButton.java b/java/src/pm/device/panel/PanelButton.java index 2484e36..deffba5 100644 --- a/java/src/pm/device/panel/PanelButton.java +++ b/java/src/pm/device/panel/PanelButton.java @@ -3,12 +3,14 @@ package pm.device.panel; import pm.Button; public enum PanelButton implements Button { - PREVIOUS_CHAPTER, + PREVIOUS, REWIND, STOP, PAUSE, PLAY, - FAST_FORWARD, - NEXT_CHAPTER, - TOGGLE_MUTE; + FORWARD, + NEXT, + VOLUME_DOWN, + MUTE, + VOLUME_UP; }