PlayerHandler methods

Author: devgianlu

api-client/src/main/java/xyz.gianlu.librespot.api.client/MainController.java

@@ -201,6 +201,31 @@ public void clickedResponse(MouseEvent mouseEvent) throws IOException {
         stage.showAndWait();
     }
 
+    public void clickedPlayerPlay(MouseEvent event) {
+        if (networkThread == null) return;
+        networkThread.sendPlayer("play", this);
+    }
+
+    public void clickedPlayerPause(MouseEvent event) {
+        if (networkThread == null) return;
+        networkThread.sendPlayer("pause", this);
+    }
+
+    public void clickedPlayerPlayPause(MouseEvent event) {
+        if (networkThread == null) return;
+        networkThread.sendPlayer("playPause", this);
+    }
+
+    public void clickedPlayerNext(MouseEvent event) {
+        if (networkThread == null) return;
+        networkThread.sendPlayer("next", this);
+    }
+
+    public void clickedPlayerPrev(MouseEvent event) {
+        if (networkThread == null) return;
+        networkThread.sendPlayer("prev", this);
+    }
+
     public static class Header {
         private final SimpleStringProperty key;
         private final SimpleStringProperty value;

api-client/src/main/java/xyz.gianlu.librespot.api.client/NetworkThread.java

@@ -65,6 +65,10 @@ void sendGeneral(@NotNull String id, @NotNull String method, @Nullable String pa
         requests.put(id, listener);
     }
 
+    void sendPlayer(@NotNull String suffix, @NotNull Callback listener) {
+        sendGeneral(String.valueOf(ThreadLocalRandom.current().nextInt(1000)), "player." + suffix, null, listener);
+    }
+
     void sendMercury(@NotNull String method, @NotNull String uri, @Nullable String contentType, @NotNull Map<String, String> headers, @NotNull Callback listener) {
         String id = String.valueOf(ThreadLocalRandom.current().nextInt(1000));
 

api-client/src/main/resources/main.fxml

@@ -133,6 +133,42 @@
                                 </HBox>
                             </content>
                         </Tab>
+                        <Tab closable="false" text="Player">
+                            <content>
+                                <FlowPane>
+                                    <children>
+                                        <Button mnemonicParsing="false" onMouseClicked="#clickedPlayerPlay" text="Play">
+                                            <FlowPane.margin>
+                                                <Insets right="8.0"/>
+                                            </FlowPane.margin>
+                                        </Button>
+                                        <Button layoutX="18.0" layoutY="18.0" onMouseClicked="#clickedPlayerPause"
+                                                mnemonicParsing="false" text="Pause">
+                                            <FlowPane.margin>
+                                                <Insets right="8.0"/>
+                                            </FlowPane.margin>
+                                        </Button>
+                                        <Button layoutX="132.0" layoutY="18.0" onMouseClicked="#clickedPlayerPlayPause"
+                                                mnemonicParsing="false" text="Play/Pause">
+                                            <FlowPane.margin>
+                                                <Insets right="8.0"/>
+                                            </FlowPane.margin>
+                                        </Button>
+                                        <Button layoutX="56.0" layoutY="18.0" onMouseClicked="#clickedPlayerNext"
+                                                mnemonicParsing="false" text="Next">
+                                            <FlowPane.margin>
+                                                <Insets right="8.0"/>
+                                            </FlowPane.margin>
+                                        </Button>
+                                        <Button layoutX="56.0" layoutY="18.0" onMouseClicked="#clickedPlayerPrev"
+                                                mnemonicParsing="false" text="Previous"/>
+                                    </children>
+                                    <padding>
+                                        <Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/>
+                                    </padding>
+                                </FlowPane>
+                            </content>
+                        </Tab>
                     </tabs>
                 </TabPane>
             </content>

api/src/main/java/xyz/gianlu/librespot/api/PlayerHandler.java

@@ -22,16 +22,25 @@ public PlayerHandler(@NotNull Session session) {
     protected @NotNull JsonElement handleRequest(ApiServer.@NotNull Request request) throws ApiServer.PredefinedJsonRpcException {
         switch (request.getSuffix()) {
             case "play":
-            case "stop":
+                player.play();
+                break;
             case "pause":
+                player.pause();
+                break;
             case "next":
+                player.next();
+                break;
             case "prev":
+                player.previous();
+                break;
             case "playPause":
-                return string("OK");
+                player.playPause();
+                break;
             default:
                 throw ApiServer.PredefinedJsonRpcException.from(request, ApiServer.PredefinedJsonRpcError.METHOD_NOT_FOUND);
-
         }
+
+        return string("OK");
     }
 
     @Override

core/src/main/java/xyz/gianlu/librespot/player/Player.java

@@ -3,9 +3,9 @@
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import xyz.gianlu.librespot.common.Utils;
-import xyz.gianlu.librespot.core.Session;
 import xyz.gianlu.librespot.common.proto.Metadata;
 import xyz.gianlu.librespot.common.proto.Spirc;
+import xyz.gianlu.librespot.core.Session;
 import xyz.gianlu.librespot.spirc.FrameListener;
 import xyz.gianlu.librespot.spirc.SpotifyIrc;
 
@@ -48,6 +48,26 @@ public Player(@NotNull PlayerConfiguration conf, @NotNull CacheManager.CacheConf
         spirc.addListener(this);
     }
 
+    public void playPause() {
+        handlePlayPause();
+    }
+
+    public void play() {
+        handlePlay();
+    }
+
+    public void pause() {
+        handlePause();
+    }
+
+    public void next() {
+        handleNext();
+    }
+
+    public void previous() {
+        handlePrev();
+    }
+
     @NotNull
     private Spirc.State.Builder initState() {
         return Spirc.State.newBuilder()
@@ -79,8 +99,7 @@ public void frame(@NotNull Spirc.Frame frame) {
                 handlePause();
                 break;
             case kMessageTypePlayPause:
-                if (state.getStatus() == Spirc.PlayStatus.kPlayStatusPlay) handlePause();
-                else if (state.getStatus() == Spirc.PlayStatus.kPlayStatusPause) handlePlay();
+                handlePlayPause();
                 break;
             case kMessageTypeNext:
                 handleNext();
@@ -115,6 +134,11 @@ public void frame(@NotNull Spirc.Frame frame) {
         }
     }
 
+    private void handlePlayPause() {
+        if (state.getStatus() == Spirc.PlayStatus.kPlayStatusPlay) handlePause();
+        else if (state.getStatus() == Spirc.PlayStatus.kPlayStatusPause) handlePlay();
+    }
+
     private void handleSetVolume(int volume) {
         spirc.deviceState().setVolume(volume);