Merge pull request #13 from yourealwaysbe/recording

Improved support for streaming and recording

Author: Laraakaa

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

@@ -65,10 +65,14 @@
 import net.twasi.obsremotejava.requests.SetTransitionDuration.SetTransitionDurationResponse;
 import net.twasi.obsremotejava.requests.SetVolume.SetVolumeRequest;
 import net.twasi.obsremotejava.requests.SetVolume.SetVolumeResponse;
+import net.twasi.obsremotejava.requests.StartRecording.StartRecordingRequest;
+import net.twasi.obsremotejava.requests.StartRecording.StartRecordingResponse;
 import net.twasi.obsremotejava.requests.StartReplayBuffer.StartReplayBufferRequest;
 import net.twasi.obsremotejava.requests.StartReplayBuffer.StartReplayBufferResponse;
 import net.twasi.obsremotejava.requests.StartStreaming.StartStreamingRequest;
 import net.twasi.obsremotejava.requests.StartStreaming.StartStreamingResponse;
+import net.twasi.obsremotejava.requests.StopRecording.StopRecordingRequest;
+import net.twasi.obsremotejava.requests.StopRecording.StopRecordingResponse;
 import net.twasi.obsremotejava.requests.StopReplayBuffer.StopReplayBufferRequest;
 import net.twasi.obsremotejava.requests.StopReplayBuffer.StopReplayBufferResponse;
 import net.twasi.obsremotejava.requests.StopStreaming.StopStreamingRequest;
@@ -108,10 +112,14 @@ public class OBSCommunicator {
     private ErrorCallback onError;
 
     // Optional callbacks
+    private Callback onRecordingStarted;
+    private Callback onRecordingStopped;
     private Callback onReplayStarted;
     private Callback onReplayStarting;
     private Callback onReplayStopped;
     private Callback onReplayStopping;
+    private Callback onStreamStarted;
+    private Callback onStreamStopped;
     private Callback onSwitchScenes;
     private Callback onScenesChanged;
     private Callback onTransitionBegin;
@@ -295,6 +303,22 @@ private void processIncomingEvent(String msg, EventType eventType) {
                     onTransitionEnd.run(new Gson().fromJson(msg, TransitionEndResponse.class));
                 }
                 break;
+            case RecordingStarted:
+                if (onRecordingStarted != null)
+                    onRecordingStarted.run(null);
+                break;
+            case RecordingStopped:
+                if (onRecordingStopped != null)
+                    onRecordingStopped.run(null);
+                break;
+            case StreamStarted:
+                if (onStreamStarted != null)
+                    onStreamStarted.run(null);
+                break;
+            case StreamStopped:
+                if (onStreamStopped != null)
+                    onStreamStopped.run(null);
+                break;
         }
     }
 
@@ -385,6 +409,22 @@ public void registerOnTransitionEnd(Callback onTransitionEnd) {
         this.onTransitionEnd = onTransitionEnd;
     }
 
+    public void registerOnRecordingStarted(Callback onRecordingStarted) {
+        this.onRecordingStarted = onRecordingStarted;
+    }
+
+    public void registerOnRecordingStopped(Callback onRecordingStopped) {
+        this.onRecordingStopped = onRecordingStopped;
+    }
+
+    public void registerOnStreamStarted(Callback onStreamStarted) {
+        this.onStreamStarted = onStreamStarted;
+    }
+
+    public void registerOnStreamStopped(Callback onStreamStopped) {
+        this.onStreamStopped = onStreamStopped;
+    }
+
     public void getScenes(Callback callback) {
         session.getRemote().sendStringByFuture(new Gson().toJson(new GetSceneListRequest(this)));
         callbacks.put(GetSceneListResponse.class, callback);
@@ -440,6 +480,20 @@ public void setSourceSettings(String sourceName, Map<String, Object> settings, C
         callbacks.put(SetSourceSettingsResponse.class, callback);
     }
 
+    public void startRecording(Callback callback) {
+        StartRecordingRequest request = new StartRecordingRequest(this);
+
+        session.getRemote().sendStringByFuture(new Gson().toJson(request));
+        callbacks.put(StartRecordingResponse.class, callback);
+    }
+
+    public void stopRecording(Callback callback) {
+        StopRecordingRequest request = new StopRecordingRequest(this);
+
+        session.getRemote().sendStringByFuture(new Gson().toJson(request));
+        callbacks.put(StopRecordingResponse.class, callback);
+    }
+
     public void getStreamingStatus(Callback callback) {
         GetStreamingStatusRequest request = new GetStreamingStatusRequest(this);
         session.getRemote().sendStringByFuture(new Gson().toJson(request));

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

@@ -137,6 +137,14 @@ public void registerConnectionFailedCallback(StringCallback onConnectionFailed)
         communicator.registerOnConnectionFailed(onConnectionFailed);
     }
 
+    public void registerRecordingStartedCallback(Callback onRecordingStarted) {
+        communicator.registerOnRecordingStarted(onRecordingStarted);
+    }
+
+    public void registerRecordingStoppedCallback(Callback onRecordingStopped) {
+        communicator.registerOnRecordingStopped(onRecordingStopped);
+    }
+
     public void registerReplayStartedCallback(Callback onReplayStarted) {
         communicator.registerOnReplayStarted(onReplayStarted);
     }
@@ -153,6 +161,14 @@ public void registerReplayStoppingCallback(Callback onReplayStopping) {
         communicator.registerOnReplayStopping(onReplayStopping);
     }
 
+    public void registerStreamStartedCallback(Callback onRecordingStarted) {
+        communicator.registerOnStreamStarted(onRecordingStarted);
+    }
+
+    public void registerStreamStoppedCallback(Callback onRecordingStopped) {
+        communicator.registerOnStreamStopped(onRecordingStopped);
+    }
+
     public void registerSwitchScenesCallback(Callback onSwitchScenes) {
         communicator.registerOnSwitchScenes(onSwitchScenes);
     }
@@ -227,6 +243,14 @@ public void stopStreaming(Callback callback) {
         communicator.stopStreaming(callback);
     }
 
+    public void startRecording(Callback callback) {
+        communicator.startRecording(callback);
+    }
+
+    public void stopRecording(Callback callback) {
+        communicator.stopRecording(callback);
+    }
+
     public void listProfiles(Callback callback) {
         communicator.listProfiles(callback);
     }

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

@@ -1,10 +1,14 @@
 package net.twasi.obsremotejava.events;
 
 public enum EventType {
+    RecordingStarted,
+    RecordingStopped,
     ReplayStarting,
     ReplayStarted,
     ReplayStopping,
     ReplayStopped,
+    StreamStarted,
+    StreamStopped,
     SwitchScenes,
     ScenesChanged,
     TransitionBegin,

src/main/java/net/twasi/obsremotejava/requests/RequestType.java

@@ -27,6 +27,8 @@ public enum RequestType {
     SetSourceSettings,
 
     GetStreamingStatus,
+    StartRecording,
+    StopRecording,
     StartStreaming,
     StopStreaming,
 

src/main/java/net/twasi/obsremotejava/requests/StartRecording/StartRecordingRequest.java

@@ -0,0 +1,14 @@
+package net.twasi.obsremotejava.requests.StartRecording;
+
+import net.twasi.obsremotejava.OBSCommunicator;
+import net.twasi.obsremotejava.requests.BaseRequest;
+import net.twasi.obsremotejava.requests.RequestType;
+
+public class StartRecordingRequest extends BaseRequest {
+
+    public StartRecordingRequest(OBSCommunicator com) {
+        super(RequestType.StartRecording);
+
+        com.messageTypes.put(getMessageId(), StartRecordingResponse.class);
+    }
+}

src/main/java/net/twasi/obsremotejava/requests/StartRecording/StartRecordingResponse.java

@@ -0,0 +1,6 @@
+package net.twasi.obsremotejava.requests.StartRecording;
+
+import net.twasi.obsremotejava.requests.ResponseBase;
+
+public class StartRecordingResponse extends ResponseBase {
+}

src/main/java/net/twasi/obsremotejava/requests/StopRecording/StopRecordingRequest.java

@@ -0,0 +1,13 @@
+package net.twasi.obsremotejava.requests.StopRecording;
+
+import net.twasi.obsremotejava.OBSCommunicator;
+import net.twasi.obsremotejava.requests.BaseRequest;
+import net.twasi.obsremotejava.requests.RequestType;
+
+public class StopRecordingRequest extends BaseRequest {
+    public StopRecordingRequest(OBSCommunicator com) {
+        super (RequestType.StopRecording);
+
+        com.messageTypes.put(getMessageId(), StopRecordingResponse.class);
+    }
+}

src/main/java/net/twasi/obsremotejava/requests/StopRecording/StopRecordingResponse.java

@@ -0,0 +1,6 @@
+package net.twasi.obsremotejava.requests.StopRecording;
+
+import net.twasi.obsremotejava.requests.ResponseBase;
+
+public class StopRecordingResponse extends ResponseBase {
+}