Merge pull request #4 from sampie777/add_switch_scene_event

Added SwitchScene event

Author: Laraakaa

src/main/java/net/twasi/obsremotejava/OBSCommunicator.java

@@ -5,6 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import net.twasi.obsremotejava.events.EventType;
+import net.twasi.obsremotejava.events.responses.SwitchScenesResponse;
 import net.twasi.obsremotejava.requests.GetAuthRequired.GetAuthRequiredRequest;
 import net.twasi.obsremotejava.requests.GetAuthRequired.GetAuthRequiredResponse;
 import net.twasi.obsremotejava.requests.GetCurrentProfile.GetCurrentProfileRequest;
@@ -95,6 +96,7 @@ public class OBSCommunicator {
     private Callback onReplayStarting;
     private Callback onReplayStopped;
     private Callback onReplayStopping;
+    private Callback onSwitchScenes;
 
     private GetVersionResponse versionInfo;
 
@@ -111,8 +113,6 @@ public void await() throws InterruptedException {
         this.closeLatch.await();
     }
 
-    ;
-
     @OnWebSocketClose
     public void onClose(int statusCode, String reason) {
         System.out.printf("Connection closed: %d - %s%n", statusCode, reason);
@@ -200,6 +200,11 @@ public void onMessage(String msg) {
                         if (onReplayStopping != null)
                             onReplayStopping.run(null);
                         break;
+                    case SwitchScenes:
+                        if (onSwitchScenes != null) {
+                            onSwitchScenes.run(new Gson().fromJson(msg, SwitchScenesResponse.class));
+                        }
+                        break;
                 }
             }
         } catch (Exception e) {
@@ -231,6 +236,10 @@ public void registerOnReplayStopping(Callback onReplayStopping) {
         this.onReplayStopping = onReplayStopping;
     }
 
+    public void registerOnSwitchScenes(Callback onSwitchScenes) {
+        this.onSwitchScenes = onSwitchScenes;
+    }
+
     public void getScenes(Callback callback) {
         session.getRemote().sendStringByFuture(new Gson().toJson(new GetSceneListRequest(this)));
         callbacks.put(GetSceneListResponse.class, callback);

src/main/java/net/twasi/obsremotejava/OBSRemoteController.java

@@ -95,6 +95,10 @@ public void registerReplayStoppingCallback(Callback onReplayStopping) {
         communicator.registerOnReplayStopping(onReplayStopping);
     }
 
+    public void registerSwitchScenesCallback(Callback onSwitchScenes) {
+        communicator.registerOnSwitchScenes(onSwitchScenes);
+    }
+
     public void await() throws InterruptedException {
         communicator.await();
     }

src/main/java/net/twasi/obsremotejava/events/EventType.java

@@ -4,5 +4,6 @@ public enum EventType {
     ReplayStarting,
     ReplayStarted,
     ReplayStopping,
-    ReplayStopped
+    ReplayStopped,
+    SwitchScenes
 }

src/main/java/net/twasi/obsremotejava/events/responses/SwitchScenesResponse.java

@@ -0,0 +1,21 @@
+package net.twasi.obsremotejava.events.responses;
+
+import com.google.gson.annotations.SerializedName;
+import net.twasi.obsremotejava.objects.Source;
+import net.twasi.obsremotejava.requests.ResponseBase;
+
+import java.util.List;
+
+public class SwitchScenesResponse extends ResponseBase {
+    @SerializedName("scene-name")
+    private String sceneName;
+    private List<Source> sources;
+
+    public String getSceneName() {
+        return sceneName;
+    }
+
+    public List<Source> getSources() {
+        return sources;
+    }
+}

src/test/java/net/twasi/obsremotejava/test/OBSRemoteControllerTest.java

@@ -2,6 +2,7 @@
 
 import net.twasi.obsremotejava.Callback;
 import net.twasi.obsremotejava.OBSRemoteController;
+import net.twasi.obsremotejava.events.responses.SwitchScenesResponse;
 import net.twasi.obsremotejava.requests.GetVersion.GetVersionResponse;
 import net.twasi.obsremotejava.requests.ResponseBase;
 import org.junit.jupiter.api.Test;
@@ -236,6 +237,12 @@ public void run(ResponseBase response) {
                 /* controller.setStudioModeEnabled(false, res -> {
                     System.out.println("Done");
                 }); */
+
+
+                controller.registerSwitchScenesCallback(res -> {
+                    SwitchScenesResponse switchScenesResponse = (SwitchScenesResponse) res;
+                    System.out.println("Switched to scene: " + switchScenesResponse.getSceneName());
+                });
             }
         });