Merge pull request #17 from Panopto/afein/m/disable-preview-fix

This fixes a customer reported bug where the light service can't be used to start a recording if the remote recorder has DisablePreview set to True.
Panopto · Feb 23, 2018 · c110b6d · c110b6d
2 parents fb09427 + e19279d
commit c110b6d
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 25 deletions.
diff --git a/PanoptoRRLightService/IStateMachine.cs b/PanoptoRRLightService/IStateMachine.cs
@@ -41,7 +41,8 @@ public enum State
         Paused,
         TransitionPausedToStop,
         TransitionRecordingToStop,
-        Stopped,
+        StoppedNoNextSchedule,
+        StoppedWithNextSchedule,
         Dormant,
         Faulted,
         Disconnected,
@@ -59,7 +60,8 @@ public enum Input
         RecorderRecording,
         RecorderStartedPotentialRecording,
         RecorderPaused,
-        RecorderStopped,
+        RecorderStoppedNoNextSchedule,
+        RecorderStoppedWithNextSchedule,
 
         /// <summary>
         /// Recorder may be in a state that is running, but not recording or previewing.

diff --git a/PanoptoRRLightService/RemoteRecorderSync.cs b/PanoptoRRLightService/RemoteRecorderSync.cs
@@ -472,10 +472,19 @@ private void StateMonitorLoop()
         /// </summary>
         private Input MapInputFrom(RemoteRecorderStatus state)
         {
+            Recording nextRecording;
             switch (state)
             {
                 case RemoteRecorderStatus.Stopped:
-                    return Input.RecorderStopped; 
+                    nextRecording = controller.GetNextRecording();
+                    if (nextRecording != null)
+                    {
+                        return Input.RecorderStoppedWithNextSchedule;
+                    }
+                    else
+                    {
+                        return Input.RecorderStoppedNoNextSchedule;
+                    }
 
                 case RemoteRecorderStatus.Recording:
                     if (Properties.Settings.Default.RequireOptInForRecording)
@@ -492,7 +501,7 @@ private Input MapInputFrom(RemoteRecorderStatus state)
                     return Input.RecorderDormant;
 
                 case RemoteRecorderStatus.Previewing:
-                    Recording nextRecording = controller.GetNextRecording();
+                    nextRecording = controller.GetNextRecording();
                     if (nextRecording != null)
                     {
                         return Input.RecorderPreviewingWithNextSchedule;