github-starred/CocoaSplit
2
0
Fork 0
mirror of https://github.com/zakk4223/CocoaSplit.git synced 2026-05-21 06:46:14 -06:00
Code Issues 32 Projects Packages Wiki Activity Actions

Add Start/Stop recording scripting event.

Browse source 
Don't call queue err_send function in ffmpeg  closeMedia, let the consumer loop do that
This commit is contained in:
Zakk 2020-04-12 15:33:41 -04:00
parent ae02cd7d16
commit 01479aca32
5 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegInput.m
View file

@ -708,8 +708,8 @@
_is_ready = NO; _is_ready = NO;
dispatch_semaphore_signal(_read_loop_semaphore); 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(_video_message_queue, AVERROR_EOF);
av_thread_message_queue_set_err_send(_audio_message_queue, AVERROR_EOF); //mkav_thread_message_queue_set_err_send(_audio_message_queue, AVERROR_EOF);
} }
} }

3
CSNotifications.m
View file

@ -21,7 +21,8 @@ NSString *const CSNotificationLayoutInStagingChanged = @"CSNotificationLayoutInS
NSString *const CSNotificationStreamStarted = @"CSNotificationStreamStarted"; NSString *const CSNotificationStreamStarted = @"CSNotificationStreamStarted";
NSString *const CSNotificationStreamStopped = @"CSNotificationStreamStopped"; NSString *const CSNotificationStreamStopped = @"CSNotificationStreamStopped";
NSString *const CSNotificationMainRecordingStarted = @"CSNotificationMainRecordingStarted";
NSString *const CSNotificationMainRecordingStopped = @"CSNotificationMainRecordingStopped";
NSString *const CSNotificationOutputAdded = @"CSNotificationOutputAdded"; NSString *const CSNotificationOutputAdded = @"CSNotificationOutputAdded";
NSString *const CSNotificationOutputDeleted = @"CSNotificationOutputDeleted"; NSString *const CSNotificationOutputDeleted = @"CSNotificationOutputDeleted";

4
CocoaSplit/CaptureController.m
View file

@ -3497,8 +3497,12 @@ NSString *const CSAppearanceSystem = @"CSAppearanceSystem";
if (mainRecordingActive) if (mainRecordingActive)
{ {
tmpColor = CGColorCreateGenericRGB(1, 0, 0, 1); tmpColor = CGColorCreateGenericRGB(1, 0, 0, 1);
[self postNotification:CSNotificationMainRecordingStarted forObject:self];
} else { } else {
tmpColor = CGColorCreateGenericRGB(1, 0, 0, 0.5); tmpColor = CGColorCreateGenericRGB(1, 0, 0, 0.5);
[self postNotification:CSNotificationMainRecordingStopped forObject:self];
} }
self.recordButton.layer.backgroundColor = tmpColor; self.recordButton.layer.backgroundColor = tmpColor;

2
CocoaSplit/PluginHeaders/CSNotifications.h
View file

@ -21,6 +21,8 @@ extern NSString *const CSNotificationLayoutInStagingChanged;
extern NSString *const CSNotificationStreamStarted; extern NSString *const CSNotificationStreamStarted;
extern NSString *const CSNotificationStreamStopped; extern NSString *const CSNotificationStreamStopped;
extern NSString *const CSNotificationMainRecordingStarted;
extern NSString *const CSNotificationMainRecordingStopped;
extern NSString *const CSNotificationOutputAdded; extern NSString *const CSNotificationOutputAdded;
extern NSString *const CSNotificationOutputDeleted; extern NSString *const CSNotificationOutputDeleted;

2
CocoaSplit/ScriptingAddditions/AppDelegate+AppDelegate_ScriptingAdditions.m
View file

@ -200,7 +200,7 @@
{ {
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]; return [keys containsObject:key];
} }