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

movie source properly deregisters observers when the movie queue is empty due to a movie playing until the end.

Browse source 
shift-selecting a layout will no longer re-add the same sources to the target layout. If they already exist they are reverted to the state of the source layout. shift-adding is undoable now.

Added an auto fit "+" button to sources.
This commit is contained in:
Zakk 2015-09-13 23:33:26 -04:00
parent f809ac4c05
commit cb356f9556
4 changed files with 141 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
CapturePlugins/CSMovieCapturePlugin/CSMovieCapturePlugin/MovieCapture.m
View file

@ -604,17 +604,22 @@ void tapProcess(MTAudioProcessingTapRef tap, CMItemCount numberFrames, MTAudioPr
self.timeToken = nil;
}
if (_avPlayer && _avPlayer.currentItem)
if (_avPlayer)
{
AVMutableAudioMixInputParameters *inputParams = _avPlayer.currentItem.audioMix.inputParameters.firstObject;
[_avPlayer pause];
[_avPlayer removeAllItems];
inputParams.audioTapProcessor = nil;
_avPlayer.currentItem.audioMix = nil;
[_avPlayer removeObserver:self forKeyPath:@"rate"];
[_avPlayer removeObserver:self forKeyPath:@"currentItem"];
if (_avPlayer.currentItem)
{
AVMutableAudioMixInputParameters *inputParams = _avPlayer.currentItem.audioMix.inputParameters.firstObject;
inputParams.audioTapProcessor = nil;
_avPlayer.currentItem.audioMix = nil;
}
_avPlayer = nil;
}

7
CocoaSplit/CaptureController.m
View file

@ -1771,13 +1771,6 @@
self.stagingCtx.layoutRenderer.transitionDirection = self.transitionDirection;
self.stagingCtx.layoutRenderer.transitionDuration = self.transitionDuration;
self.stagingCtx.layoutRenderer.transitionFilter = self.transitionFilter;
[self stagingSave:self];

1
CocoaSplit/LayoutRenderer.m
View file

@ -175,6 +175,7 @@
[_transitionLayout.rootLayer removeFromSuperlayer];
_transitionLayout.isActive = NO;
_transitionLayout = nil;
}
[self.renderer.layer addSublayer:self.layout.rootLayer];

142
CocoaSplit/SourceLayout.m
View file

@ -435,8 +435,6 @@
}
-(NSObject *)mergeSourceListData:(NSData *)mergeData withLayer:(CALayer *)withLayer
{
@ -445,7 +443,7 @@
{
self.sourceList = [NSMutableArray array];
}
if (!mergeData)
{
return nil;
@ -456,6 +454,8 @@
withLayer = self.rootLayer;
}
NSMutableArray *undoSources = [NSMutableArray array];
NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:mergeData];
[unarchiver setDelegate:self];
@ -480,6 +480,45 @@
{
src.sourceLayout = self;
src.is_live = self.isActive;
InputSource *eSrc = [self inputForUUID:src.uuid];
if (eSrc)
{
CATransition *rTrans = [CATransition animation];
rTrans.type = @"flip";
rTrans.duration = 2.5;
rTrans.removedOnCompletion = YES;
[CATransaction begin];
[eSrc.layer.superlayer addSublayer:src.layer];
src.layer.hidden = YES;
[CATransaction commit];
[CATransaction begin];
__weak SourceLayout *weakSelf = self;
[CATransaction setCompletionBlock:^{
[weakSelf deleteSource:eSrc];
}];
//[eSrc.layer addAnimation:rTrans forKey:nil];
// [src.layer addAnimation:rTrans forKey:nil];
eSrc.layer.hidden = YES;
src.layer.hidden = NO;
[CATransaction commit];
[undoSources addObject:eSrc];
}
if (undoSources.count > 0)
{
NSData *undoData = [NSKeyedArchiver archivedDataWithRootObject:undoSources];
[[self.undoManager prepareWithInvocationTarget:self] mergeSourceListData:undoData withLayer:nil];
} else {
[[self.undoManager prepareWithInvocationTarget:self] removeSourceListData:mergeData withLayer:nil];
}
[NSApp registerMIDIResponder:src];
@ -492,20 +531,96 @@
}
[[self mutableArrayValueForKey:@"sourceList" ] addObject:src];
[_uuidMap setObject:src forKey:src.uuid];
if (self.undoManager)
}
if (self.undoManager)
{
[self.undoManager endUndoGrouping];
}
return mergeObj;
}
-(NSObject *)removeSourceListData:(NSData *)mergeData withLayer:(CALayer *)withLayer
{
if (!self.sourceList)
{
return nil;
}
if (!mergeData)
{
return nil;
}
if (!withLayer)
{
withLayer = self.rootLayer;
}
NSMutableArray *undoSources = [NSMutableArray array];
NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:mergeData];
[unarchiver setDelegate:self];
NSObject *mergeObj = [unarchiver decodeObjectForKey:@"root"];
[unarchiver finishDecoding];
NSArray *mergeList;
if ([mergeObj isKindOfClass:[NSDictionary class]])
{
mergeList = [((NSDictionary *)mergeObj) objectForKey:@"sourcelist"];
} else {
mergeList = (NSArray *)mergeObj;
}
if (self.undoManager)
{
[self.undoManager beginUndoGrouping];
}
for(InputSource *src in mergeList)
{
src.sourceLayout = self;
InputSource *eSrc = [self inputForUUID:src.uuid];
if (eSrc)
{
CATransition *rTrans = [CATransition animation];
rTrans.type = @"flip";
rTrans.duration = 2.5;
rTrans.removedOnCompletion = YES;
[CATransaction begin];
__weak SourceLayout *weakSelf = self;
[[weakSelf.undoManager prepareWithInvocationTarget:weakSelf] modifyUUID:src.uuid withBlock:^(InputSource *input) {
[weakSelf deleteSource:input];
[CATransaction setCompletionBlock:^{
[weakSelf deleteSource:eSrc];
}];
[eSrc.layer addAnimation:rTrans forKey:nil];
// [src.layer addAnimation:rTrans forKey:nil];
eSrc.layer.hidden = YES;
[CATransaction commit];
[undoSources addObject:eSrc];
}
if (undoSources.count > 0)
{
NSData *undoData = [NSKeyedArchiver archivedDataWithRootObject:undoSources];
[[self.undoManager prepareWithInvocationTarget:self] mergeSourceListData:undoData withLayer:nil];
}
}
if (self.undoManager)
{
@ -601,7 +716,12 @@
[[self mutableArrayValueForKey:@"sourceList" ] removeObject:delSource];
[_uuidMap removeObjectForKey:delSource.uuid];
InputSource *uSrc;
uSrc = _uuidMap[delSource.uuid];
if ([uSrc isEqual:delSource])
{
[_uuidMap removeObjectForKey:delSource.uuid];
}
//[self.sourceList removeObject:delSource];
if (delSource == self.layoutTimingSource)