Add Start/Stop recording scripting event.

Don't call queue err_send function in ffmpeg closeMedia, let the consumer loop do that
zakk4223 · Apr 12, 2020 · 01479ac · 01479ac
1 parent ae02cd7
commit 01479ac
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegInput.m b/CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegInput.m
@@ -708,8 +708,8 @@ -(void)closeMedia
         _is_ready = NO;
         dispatch_semaphore_signal(_read_loop_semaphore);
 
-        av_thread_message_queue_set_err_send(_video_message_queue, AVERROR_EOF);
-        av_thread_message_queue_set_err_send(_audio_message_queue, AVERROR_EOF);
+        //av_thread_message_queue_set_err_send(_video_message_queue, AVERROR_EOF);
+        //mkav_thread_message_queue_set_err_send(_audio_message_queue, AVERROR_EOF);
     }
 }
 

diff --git a/CSNotifications.m b/CSNotifications.m
@@ -21,7 +21,8 @@
 
 NSString *const CSNotificationStreamStarted = @"CSNotificationStreamStarted";
 NSString *const CSNotificationStreamStopped = @"CSNotificationStreamStopped";
-
+NSString *const CSNotificationMainRecordingStarted = @"CSNotificationMainRecordingStarted";
+NSString *const CSNotificationMainRecordingStopped = @"CSNotificationMainRecordingStopped";
 
 NSString *const CSNotificationOutputAdded = @"CSNotificationOutputAdded";
 NSString *const CSNotificationOutputDeleted = @"CSNotificationOutputDeleted";

diff --git a/CocoaSplit/CaptureController.m b/CocoaSplit/CaptureController.m
@@ -3497,8 +3497,12 @@ -(void)setMainRecordingActive:(bool)mainRecordingActive
     if (mainRecordingActive)
     {
         tmpColor = CGColorCreateGenericRGB(1, 0, 0, 1);
+        [self postNotification:CSNotificationMainRecordingStarted forObject:self];
+
     } else {
         tmpColor = CGColorCreateGenericRGB(1, 0, 0, 0.5);
+        [self postNotification:CSNotificationMainRecordingStopped forObject:self];
+
     }
 
     self.recordButton.layer.backgroundColor = tmpColor;

diff --git a/CocoaSplit/PluginHeaders/CSNotifications.h b/CocoaSplit/PluginHeaders/CSNotifications.h
@@ -21,6 +21,8 @@ extern NSString *const CSNotificationLayoutInStagingChanged;
 extern NSString *const CSNotificationStreamStarted;
 extern NSString *const CSNotificationStreamStopped;
 
+extern NSString *const CSNotificationMainRecordingStarted;
+extern NSString *const CSNotificationMainRecordingStopped;
 
 extern NSString *const CSNotificationOutputAdded;
 extern NSString *const CSNotificationOutputDeleted;

diff --git a/CocoaSplit/ScriptingAddditions/AppDelegate+AppDelegate_ScriptingAdditions.m b/CocoaSplit/ScriptingAddditions/AppDelegate+AppDelegate_ScriptingAdditions.m
@@ -200,7 +200,7 @@ -(BOOL)application:(NSApplication *)sender delegateHandlesKey:(NSString *)key
 {
 
 
-    NSArray *keys = @[@"layouts", @"width", @"height", @"fps", @"activelayout", @"layoutscripts", @"audioInputs", @"captureDestinations", @"staginglayout", @"livelayout", @"useTransitions", @"previewAudio", @"streamAudio", @"transitions", @"streamRunning", @"stagingEnabled", @"audioTracks"];
+    NSArray *keys = @[@"layouts", @"width", @"height", @"fps", @"activelayout", @"layoutscripts", @"audioInputs", @"captureDestinations", @"staginglayout", @"livelayout", @"useTransitions", @"previewAudio", @"streamAudio", @"transitions", @"streamRunning", @"stagingEnabled", @"audioTracks", @"recordingActive"];
 
     return [keys containsObject:key];
 }