diff --git a/CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegCapture.m b/CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegCapture.m index ceab8d23..1ae20d37 100644 --- a/CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegCapture.m +++ b/CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegCapture.m @@ -531,7 +531,6 @@ -(void)dealloc { - NSLog(@"MOVIE DEALLOC"); if (self.pcmPlayer) { [self deregisterPCMOutput]; diff --git a/CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegInput.m b/CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegInput.m index 49cf6c27..85219976 100644 --- a/CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegInput.m +++ b/CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegInput.m @@ -662,7 +662,7 @@ av_frame_unref(conv_frame); av_frame_free(&conv_frame); } - if (!_first_frame) + if (!_first_frame && conv_frame) { _first_frame = av_frame_alloc(); av_frame_ref(_first_frame, conv_frame); diff --git a/CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegPlayer.m b/CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegPlayer.m index 8750f29f..e6a974ef 100644 --- a/CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegPlayer.m +++ b/CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegPlayer.m @@ -293,7 +293,6 @@ [self insertObject:item inInputQueueAtIndex:self.inputQueue.count]; if (self.inputQueue.count == 1) { - NSLog(@"OPEN MEDIA"); [item openMedia:20]; } @@ -472,7 +471,6 @@ useInput = self.inputQueue.firstObject; } - NSLog(@"USE INPUT %@", useInput); if (useInput) { diff --git a/CapturePlugins/CSAVFCapturePlugin/CSAVFCapturePlugin/AVFSession.m b/CapturePlugins/CSAVFCapturePlugin/CSAVFCapturePlugin/AVFSession.m index 0f2befb5..0f9bf10e 100644 --- a/CapturePlugins/CSAVFCapturePlugin/CSAVFCapturePlugin/AVFSession.m +++ b/CapturePlugins/CSAVFCapturePlugin/CSAVFCapturePlugin/AVFSession.m @@ -197,7 +197,6 @@ { if (connection.output == _video_capture_output) { - NSLog(@"DROPPED FRAME!!!"); } } diff --git a/CapturePlugins/CSDeckLinkCapturePlugin/CSDeckLinkCapturePlugin/CSDeckLinkDevice.mm b/CapturePlugins/CSDeckLinkCapturePlugin/CSDeckLinkCapturePlugin/CSDeckLinkDevice.mm index 15a7f678..407c1b4d 100644 --- a/CapturePlugins/CSDeckLinkCapturePlugin/CSDeckLinkCapturePlugin/CSDeckLinkDevice.mm +++ b/CapturePlugins/CSDeckLinkCapturePlugin/CSDeckLinkCapturePlugin/CSDeckLinkDevice.mm @@ -403,7 +403,6 @@ -(void)stopCapture { - NSLog(@"STOPPING CAPTURE!"); if (_deviceInput) { _deviceInput->StopStreams(); diff --git a/CapturePlugins/CSShapeCapturePlugin/CSShapeCapturePlugin/CSShapeCapture.m b/CapturePlugins/CSShapeCapturePlugin/CSShapeCapturePlugin/CSShapeCapture.m index 888f839f..daa87769 100644 --- a/CapturePlugins/CSShapeCapturePlugin/CSShapeCapturePlugin/CSShapeCapture.m +++ b/CapturePlugins/CSShapeCapturePlugin/CSShapeCapturePlugin/CSShapeCapture.m @@ -208,8 +208,6 @@ if (self.fillColor) { newLayer.fillColor = [self.fillColor CGColor]; - NSLog(@"REF COUNT OF BG COLOR %ld", CFGetRetainCount(newLayer.fillColor)); - } if (self.lineColor) diff --git a/CapturePlugins/CSSyphonCapturePlugin/CSSyphonCapturePlugin/CSSyphonInjectCapture.m b/CapturePlugins/CSSyphonCapturePlugin/CSSyphonCapturePlugin/CSSyphonInjectCapture.m index 63cd0735..1d7dbb88 100644 --- a/CapturePlugins/CSSyphonCapturePlugin/CSSyphonCapturePlugin/CSSyphonInjectCapture.m +++ b/CapturePlugins/CSSyphonCapturePlugin/CSSyphonCapturePlugin/CSSyphonInjectCapture.m @@ -223,7 +223,6 @@ { - NSLog(@"INJECTING %@", toInject); self.injectSB = [SBApplication applicationWithProcessIdentifier:toInject.processIdentifier]; [self.injectSB setTimeout:10*60]; diff --git a/CocoaSplit/AVFAudioCapture.m b/CocoaSplit/AVFAudioCapture.m index 3b9370ec..bd84d4c0 100644 --- a/CocoaSplit/AVFAudioCapture.m +++ b/CocoaSplit/AVFAudioCapture.m @@ -243,7 +243,6 @@ [_capture_session addOutput:_audio_capture_output]; } else { - NSLog(@"COULDN'T ADD AUDIO OUTPUT"); } [_capture_session commitConfiguration]; diff --git a/CocoaSplit/AnimationSamples/rotate.py b/CocoaSplit/AnimationSamples/rotate.py index 43dfcb2c..a117f53d 100644 --- a/CocoaSplit/AnimationSamples/rotate.py +++ b/CocoaSplit/AnimationSamples/rotate.py @@ -9,7 +9,6 @@ animation_params = ["degrees"] def do_animation(): - NSLog("RUNNING ANIMATION") source1 = inputByName('source1') source2 = inputsByName('source2') diff --git a/CocoaSplit/CAMultiAudio/CAMultiAudioDelay.m b/CocoaSplit/CAMultiAudio/CAMultiAudioDelay.m index 73c54ef5..0364369f 100644 --- a/CocoaSplit/CAMultiAudio/CAMultiAudioDelay.m +++ b/CocoaSplit/CAMultiAudio/CAMultiAudioDelay.m @@ -26,7 +26,6 @@ -(void)setDelay:(float)delay { _delay = delay; - NSLog(@"DELAY SET %f", delay); AudioUnitSetParameter(self.audioUnit, kDelayParam_DelayTime, kAudioUnitScope_Global, 0, self.delay, 0); diff --git a/CocoaSplit/CAMultiAudio/CAMultiAudioDevice.m b/CocoaSplit/CAMultiAudio/CAMultiAudioDevice.m index 542f9734..0404657a 100644 --- a/CocoaSplit/CAMultiAudio/CAMultiAudioDevice.m +++ b/CocoaSplit/CAMultiAudio/CAMultiAudioDevice.m @@ -63,7 +63,6 @@ OSStatus err = AudioUnitGetProperty(self.audioUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Output, 0, outfmt, &outsize); - NSLog(@"MY OUTPUT FORMAT %d %f", err, outfmt->mSampleRate); return outfmt; } diff --git a/CocoaSplit/CAMultiAudio/CAMultiAudioEngine.m b/CocoaSplit/CAMultiAudio/CAMultiAudioEngine.m index 3c412a98..0261a335 100644 --- a/CocoaSplit/CAMultiAudio/CAMultiAudioEngine.m +++ b/CocoaSplit/CAMultiAudio/CAMultiAudioEngine.m @@ -320,7 +320,6 @@ OSStatus encoderRenderCallback( void *inRefCon, AudioUnitRenderActionFlags *ioAc if ([self.graphOutputNode respondsToSelector:@selector(setOutputForDevice)]) { - NSLog(@"SET OUTPUT NODE"); [self.graphOutputNode setOutputForDevice]; } @@ -549,9 +548,9 @@ OSStatus encoderRenderCallback( void *inRefCon, AudioUnitRenderActionFlags *ioAc -(void)removeFileInput:(CAMultiAudioFile *)toRemove { - + [self removeInput:toRemove]; - + NSUInteger index = [self.fileInputs indexOfObject:toRemove]; if (index != NSNotFound) { @@ -578,6 +577,7 @@ OSStatus encoderRenderCallback( void *inRefCon, AudioUnitRenderActionFlags *ioAc -(void)addFileInput:(CAMultiAudioFile *)fileInput { [self attachFileInput:fileInput]; + [self.fileInputs addObject:fileInput]; } @@ -659,7 +659,6 @@ OSStatus encoderRenderCallback( void *inRefCon, AudioUnitRenderActionFlags *ioAc if (!ret) { - NSLog(@"ADD NODE %@ FAILED", graphInput); return NO; } @@ -670,7 +669,6 @@ OSStatus encoderRenderCallback( void *inRefCon, AudioUnitRenderActionFlags *ioAc ret = [self.graph addNode:dmix]; if (!ret) { - NSLog(@"ADD MIXER %@ failed", dmix); [self disconnectInputNode:input]; return NO; } @@ -679,7 +677,6 @@ OSStatus encoderRenderCallback( void *inRefCon, AudioUnitRenderActionFlags *ioAc ret = [self.graph addNode:eq]; if (!ret) { - NSLog(@"ADD EQ %@ failed", eq); [self disconnectInputNode:input]; return NO; } @@ -688,7 +685,6 @@ OSStatus encoderRenderCallback( void *inRefCon, AudioUnitRenderActionFlags *ioAc if (![self.graph connectNode:eq toNode:self.encodeMixer]) { - NSLog(@"CONNECT EQ TO ENCODE FAILED"); [self disconnectInputNode:input]; return NO; } @@ -708,14 +704,12 @@ OSStatus encoderRenderCallback( void *inRefCon, AudioUnitRenderActionFlags *ioAc ret = [self.graph addNode:delayNode]; if (!ret) { - NSLog(@"ADD DELAY %@ (%d) failed %d", delayNode, i, input.channelCount); [self disconnectInputNode:input]; return NO; } ret = [self.graph connectNode:delayNode toNode:connectNode]; if (!ret) { - NSLog(@"CONNECT DELAY %@ (%d) failed", delayNode, i); [self.graph removeNode:delayNode]; [self disconnectInputNode:input]; @@ -728,7 +722,6 @@ OSStatus encoderRenderCallback( void *inRefCon, AudioUnitRenderActionFlags *ioAc if (![self.graph connectNode:dmix toNode:connectNode]) { - NSLog(@"CONNECT EQ/DMIX FAILED"); [self disconnectInputNode:input]; return NO; } @@ -737,7 +730,6 @@ OSStatus encoderRenderCallback( void *inRefCon, AudioUnitRenderActionFlags *ioAc if (input.converterNode) { [self.graph addNode:input.converterNode]; - NSLog(@"ADDED CONVERTER"); if (![self.graph connectNode:input.converterNode toNode:dmix]) { [self disconnectInputNode:input]; @@ -754,7 +746,6 @@ OSStatus encoderRenderCallback( void *inRefCon, AudioUnitRenderActionFlags *ioAc if (![self.graph connectNode:graphInput toNode:dmix]) { - NSLog(@"LAST CONNECT FAILED %@", graphInput); [self disconnectInputNode:input]; return NO; } @@ -765,6 +756,7 @@ OSStatus encoderRenderCallback( void *inRefCon, AudioUnitRenderActionFlags *ioAc dmix.volume = graphInput.volume; } + return YES; } @@ -812,7 +804,6 @@ OSStatus encoderRenderCallback( void *inRefCon, AudioUnitRenderActionFlags *ioAc -(bool)attachInput:(CAMultiAudioInput *)input { - bool ret = [self attachInputCommon:input]; if (!ret) { diff --git a/CocoaSplit/CAMultiAudio/CAMultiAudioGraph.m b/CocoaSplit/CAMultiAudio/CAMultiAudioGraph.m index ababaf71..b166d38e 100644 --- a/CocoaSplit/CAMultiAudio/CAMultiAudioGraph.m +++ b/CocoaSplit/CAMultiAudio/CAMultiAudioGraph.m @@ -192,11 +192,13 @@ } OSStatus err; + /* if (![self stopGraph]) { NSLog(@"Graph %@: graphUpdate, stopGraph failed", self); return NO; } + */ err = AUGraphUpdate(_graphInst, NULL); if (err) @@ -205,12 +207,13 @@ return NO; } + /* if (![self startGraph]) { NSLog(@"Graph %@: graphUpdate, startGraph failed", self); return NO; - } + }*/ return YES; } @@ -266,11 +269,10 @@ if (![self graphUpdate]) { + NSLog(@"Graph %@ graphUpdate for connection failed %@ -> %@", self, node, toNode); return NO; } - - return YES; } diff --git a/CocoaSplit/CAMultiAudio/CAMultiAudioMixer.m b/CocoaSplit/CAMultiAudio/CAMultiAudioMixer.m index 7e7bcb99..43615fea 100644 --- a/CocoaSplit/CAMultiAudio/CAMultiAudioMixer.m +++ b/CocoaSplit/CAMultiAudio/CAMultiAudioMixer.m @@ -23,7 +23,7 @@ -(void)willInitializeNode { - UInt32 elementCount = 32; + UInt32 elementCount = 64; OSStatus err = AudioUnitSetProperty(self.audioUnit, kAudioUnitProperty_ElementCount, kAudioUnitScope_Input, 0,&elementCount, sizeof(UInt32)); @@ -47,9 +47,7 @@ [self setOutputVolume]; - for (UInt32 i = 0; i < 15; i++) { - [self setVolumeOnInputBus:i volume:1.0]; - } + } @@ -117,27 +115,51 @@ -(UInt32)getNextElement { UInt32 elementCount = 0; - UInt32 elementSize = 0; + UInt32 elementSize = sizeof(UInt32); - //AudioUnitUninitialize(self.audioUnit); - AudioUnitSetProperty(self.audioUnit, kAudioUnitProperty_ElementCount, kAudioUnitScope_Input, 0, &elementCount, elementSize); - // AudioUnitInitialize(self.audioUnit); + UInt32 useElement = 0; + AudioUnitGetProperty(self.audioUnit, kAudioUnitProperty_ElementCount, kAudioUnitScope_Input, 0, &elementCount, &elementSize); - /* - UInt32 interactionCnt = elementCount*2; + UInt32 interactionCnt = 0; + + AUGraphCountNodeInteractions(self.graph.graphInst, self.node, &interactionCnt); AUNodeInteraction *interactions = malloc(sizeof(AUNodeInteraction)*interactionCnt); AUGraphGetNodeInteractions(self.graph.graphInst, self.node, &interactionCnt, interactions); - */ - //Naive implementation. bump up element count by one and return that as the bus to connect to. + useElement = 0; + UInt32 seenIdx = 0; - //elementCount = 3; + for (int i=0; i < interactionCnt; i++) + { + + AUNodeInteraction iact = interactions[i]; + if (iact.nodeInteractionType == kAUNodeInteraction_Connection && iact.nodeInteraction.connection.destNode == self.node) + { + if (seenIdx != iact.nodeInteraction.connection.destInputNumber) + { + useElement = seenIdx; + break; + } else { + seenIdx++; + useElement = iact.nodeInteraction.connection.destInputNumber+1; + } + + } + } + + free(interactions); + if (useElement >= elementCount) + { + elementCount += 64; + AudioUnitSetProperty(self.audioUnit, kAudioUnitProperty_ElementCount, kAudioUnitScope_Input, 0, &elementCount, sizeof(elementCount)); + } - //NSLog(@"RETURNING ELEMENT %d", elementCount-1); - return _nextElement++; + [self setVolumeOnInputBus:useElement volume:1.0]; + + return useElement; } diff --git a/CocoaSplit/CAMultiAudio/CAMultiAudioPCMPlayer.m b/CocoaSplit/CAMultiAudio/CAMultiAudioPCMPlayer.m index 32a93c6a..c2e40c53 100644 --- a/CocoaSplit/CAMultiAudio/CAMultiAudioPCMPlayer.m +++ b/CocoaSplit/CAMultiAudio/CAMultiAudioPCMPlayer.m @@ -382,7 +382,6 @@ void BufferCompletedPlaying(void *userData, ScheduledAudioSlice *bufferList); -(void)dealloc { - NSLog(@"DEALLOC PCM PLAYER"); [self flush]; _pendingBuffers = nil; if (_inputFormat) diff --git a/CocoaSplit/CAMultiAudio/CAMultiAudioUnit.m b/CocoaSplit/CAMultiAudio/CAMultiAudioUnit.m index cbde27aa..51928f43 100644 --- a/CocoaSplit/CAMultiAudio/CAMultiAudioUnit.m +++ b/CocoaSplit/CAMultiAudio/CAMultiAudioUnit.m @@ -64,7 +64,6 @@ CAShow(_audioUnit); OSStatus err = AudioOutputUnitStart(_audioUnit); - NSLog(@"AU OUTPUT START %d", err); } @end diff --git a/CocoaSplit/CSAnimationRunner/cocoasplit.js b/CocoaSplit/CSAnimationRunner/cocoasplit.js index 372bdedf..af372356 100644 --- a/CocoaSplit/CSAnimationRunner/cocoasplit.js +++ b/CocoaSplit/CSAnimationRunner/cocoasplit.js @@ -10,7 +10,7 @@ var runAnimationForLayoutWithExtraDictionary = function(animation_string, layout try { - setCompletionBlock(function() { console.log("COMPLETION BLOCK");}); + //setCompletionBlock(function() { console.log("COMPLETION BLOCK");}); eval(animation_string); } catch(err) { diff --git a/CocoaSplit/CSAudioInputSource.m b/CocoaSplit/CSAudioInputSource.m index cc86f3e9..4adb163e 100644 --- a/CocoaSplit/CSAudioInputSource.m +++ b/CocoaSplit/CSAudioInputSource.m @@ -53,7 +53,6 @@ { if (self = [self init]) { - NSLog(@"INIT WITH NODE: NODE UUID %@", node.nodeUID); self.audioUUID = node.nodeUID; self.audioVolume = node.volume; @@ -94,7 +93,6 @@ { NSDictionary *userData = notification.userInfo; NSString *nodeUUID = userData[@"UUID"]; - NSLog(@"NOTIFICAION FOR %@", nodeUUID); if (nodeUUID && [nodeUUID isEqualToString:self.audioUUID]) { [self applyAudioSettings]; diff --git a/CocoaSplit/CSCaptureBase.m b/CocoaSplit/CSCaptureBase.m index 768b1ba1..32c3c229 100644 --- a/CocoaSplit/CSCaptureBase.m +++ b/CocoaSplit/CSCaptureBase.m @@ -521,7 +521,6 @@ } -(void)dealloc { - NSLog(@"CAPTURE BASE DEALLOC"); if (self.timerDelegate) { [self.timerDelegate frameTimerWillStop:self.timerDelegateCtx]; diff --git a/CocoaSplit/CSIOSurfaceLayer.m b/CocoaSplit/CSIOSurfaceLayer.m index 59678c5c..628cecd4 100644 --- a/CocoaSplit/CSIOSurfaceLayer.m +++ b/CocoaSplit/CSIOSurfaceLayer.m @@ -232,7 +232,6 @@ if (infologLength > 0) { - NSLog(@"LOG FOR SHADER %@: %s\n",shaderPath, infoLog); } } @@ -660,7 +659,6 @@ -(void)releaseCGLContext:(CGLContextObj)ctx { - NSLog(@"RELEASE CGL CONTEXT!"); CGLDestroyContext(ctx); } diff --git a/CocoaSplit/CSInputLayer.m b/CocoaSplit/CSInputLayer.m index d71531ad..141403ec 100644 --- a/CocoaSplit/CSInputLayer.m +++ b/CocoaSplit/CSInputLayer.m @@ -301,7 +301,6 @@ { if (self = [super init]) { - NSLog(@"INPUT LAYER INIT %@", self); self.minificationFilter = kCAFilterTrilinear; self.magnificationFilter = kCAFilterTrilinear; diff --git a/CocoaSplit/CSLayoutRecorder.m b/CocoaSplit/CSLayoutRecorder.m index 6c88ef1a..85de6461 100644 --- a/CocoaSplit/CSLayoutRecorder.m +++ b/CocoaSplit/CSLayoutRecorder.m @@ -94,7 +94,6 @@ -(void)stopRecordingForOutput:(OutputDestination *)output { - NSLog(@"STOP RECORDING"); OutputDestination *useOut; for (OutputDestination *tmpOut in self.outputs) @@ -110,7 +109,6 @@ useOut.captureRunning = NO; [useOut stopOutput]; - NSLog(@"RESETTING OUTPUT"); [useOut reset]; [self.outputs removeObject:useOut]; @@ -170,7 +168,7 @@ { - NSLog(@"RECORDING ACTIVE? %d", self.recordingActive); + if (!self.recordingActive) { @@ -194,7 +192,6 @@ if (!self.audioEngine) { - NSLog(@"CREATING AUDIO ENGINE"); self.audioEngine = [[CAMultiAudioEngine alloc] init]; self.audioEngine.sampleRate = [CaptureController sharedCaptureController].audioSamplerate; @@ -540,7 +537,6 @@ if (CMTIME_COMPARE_INLINE(_firstAudioTime, ==, kCMTimeZero)) { - NSLog(@"FIRST AUDIO AT %f", CFAbsoluteTimeGetCurrent()); _firstAudioTime = orig_pts; return; diff --git a/CocoaSplit/CSPreviewOverlayView.m b/CocoaSplit/CSPreviewOverlayView.m index 75c428c2..a58a00d8 100644 --- a/CocoaSplit/CSPreviewOverlayView.m +++ b/CocoaSplit/CSPreviewOverlayView.m @@ -289,10 +289,6 @@ return NO; } --(void)mouseEntered:(NSEvent *)theEvent -{ - NSLog(@"MOUSE ENTERED!!!"); -} @end diff --git a/CocoaSplit/CSSequenceItem.m b/CocoaSplit/CSSequenceItem.m index 5b8ae246..dc3e9e55 100644 --- a/CocoaSplit/CSSequenceItem.m +++ b/CocoaSplit/CSSequenceItem.m @@ -73,7 +73,6 @@ if (configViewController) { - NSLog(@"CONFIG VIEW C %@", configViewController); //Be gross like input view controllers! configViewController.sequenceItem = self; } diff --git a/CocoaSplit/CSTransitionAnimationDelegate.m b/CocoaSplit/CSTransitionAnimationDelegate.m index 9e528903..edff0fae 100644 --- a/CocoaSplit/CSTransitionAnimationDelegate.m +++ b/CocoaSplit/CSTransitionAnimationDelegate.m @@ -14,10 +14,8 @@ -(void)animationDidStart:(CAAnimation *)anim { - NSLog(@"ANIMATION DID START"); [CATransaction begin]; [CATransaction setCompletionBlock:^{ - NSLog(@"TRANSACTION COMPLETION BLOCK"); for (InputSource *nSrc in self.addedInputs) { if (nSrc.layer) @@ -87,9 +85,11 @@ } - +/* -(void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag { NSLog(@"DELEGATE ANIMATION STOPPED"); -} +}*/ + + @end diff --git a/CocoaSplit/CaptureController.m b/CocoaSplit/CaptureController.m index e614c9a8..b5284eb5 100644 --- a/CocoaSplit/CaptureController.m +++ b/CocoaSplit/CaptureController.m @@ -1431,7 +1431,6 @@ //Reassert recording flag for save if (forLayout) { - NSLog(@"REASSERT RECORDING"); forLayout.recordingLayout = YES; } @@ -1581,7 +1580,6 @@ PyObject *ret = PyRun_File(runnerFile, (char *)[[fromFile lastPathComponent] UTF8String], Py_file_input, dict_copy, dict_copy); if (!ret) { - NSLog(@"PYTHON RETURNED NULL!"); PyErr_Print(); return nil; } @@ -2087,7 +2085,6 @@ self.compressors = [[saveRoot valueForKey:@"compressors"] mutableCopy]; - NSLog(@"COMPRESSORS %@", self.compressors); if (!self.compressors) { @@ -2307,7 +2304,6 @@ { if (layout.recordingLayout) { - NSLog(@"RECORD LAYOUT"); [self startRecordingLayout:layout]; } } @@ -2740,7 +2736,6 @@ outdest.settingsController = self.mainLayoutRecorder; if (outdest.active) { - NSLog(@"RESET AND SETUP %@", outdest); [outdest reset]; [outdest setup]; diff --git a/CocoaSplit/Compressor/AppleProResCompressor.m b/CocoaSplit/Compressor/AppleProResCompressor.m index 5f808efb..a9436de1 100644 --- a/CocoaSplit/Compressor/AppleProResCompressor.m +++ b/CocoaSplit/Compressor/AppleProResCompressor.m @@ -229,7 +229,6 @@ void __ProResPixelBufferRelease( void *releaseRefCon, const void *baseAddress ) if (status != noErr || !_compression_session) { - NSLog(@"COMPRESSOR SETUP ERROR"); self.errored = YES; return NO; } diff --git a/CocoaSplit/Compressor/AppleVTCompressor.m b/CocoaSplit/Compressor/AppleVTCompressor.m index 320acc46..78f4ef90 100644 --- a/CocoaSplit/Compressor/AppleVTCompressor.m +++ b/CocoaSplit/Compressor/AppleVTCompressor.m @@ -234,10 +234,9 @@ void PixelBufferRelease( void *releaseRefCon, const void *baseAddress ) { - CFArrayRef encoders = NULL; + // CFArrayRef encoders = NULL; - VTCopyVideoEncoderList(NULL, &encoders); - NSLog(@"ENCODERS %@", encoders); + // VTCopyVideoEncoderList(NULL, &encoders); NSMutableDictionary *encoderSpec = [[NSMutableDictionary alloc] init]; encoderSpec[(__bridge NSString *)kVTVideoEncoderSpecification_RequireHardwareAcceleratedVideoEncoder] = @YES; @@ -301,7 +300,6 @@ void PixelBufferRelease( void *releaseRefCon, const void *baseAddress ) if (status != noErr || !_compression_session) { - NSLog(@"COMPRESSOR SETUP ERROR"); self.errored = YES; return NO; } diff --git a/CocoaSplit/Compressor/x264Compressor.m b/CocoaSplit/Compressor/x264Compressor.m index 85182beb..f10ee348 100644 --- a/CocoaSplit/Compressor/x264Compressor.m +++ b/CocoaSplit/Compressor/x264Compressor.m @@ -169,7 +169,6 @@ { @synchronized (self) { _reset_flag = YES; - NSLog(@"DISPATCH SIGNAL FOR RESET"); dispatch_semaphore_signal(_queueSemaphore); } } @@ -390,7 +389,6 @@ [dest writeEncodedData:frameData]; } - NSLog(@"DID NOT ENCODE"); return NO; } @@ -673,7 +671,6 @@ _av_codec = NULL; av_dict_free(&opts); - NSLog(@"CODEC SETUP FAILED!"); return NO; } diff --git a/CocoaSplit/FFMpegTask.m b/CocoaSplit/FFMpegTask.m index f91a0abc..82dc054b 100644 --- a/CocoaSplit/FFMpegTask.m +++ b/CocoaSplit/FFMpegTask.m @@ -17,10 +17,6 @@ #include "libavformat/avformat.h" --(void)dealloc -{ - NSLog(@"DEALLOC FFMPEG"); -} -(NSUInteger)frameQueueSize { @@ -359,7 +355,6 @@ void getAudioExtradata(char *cookie, char **buffer, size_t *size) if (!_av_fmt_ctx) { - NSLog(@"NO FMT CTX"); return NO; } @@ -372,7 +367,6 @@ void getAudioExtradata(char *cookie, char **buffer, size_t *size) if (!_av_video_stream) { - NSLog(@"VIDEO STREAM SETUP FAIL"); return NO; } diff --git a/CocoaSplit/InputSource.m b/CocoaSplit/InputSource.m index a31ddbec..6894666d 100644 --- a/CocoaSplit/InputSource.m +++ b/CocoaSplit/InputSource.m @@ -682,7 +682,6 @@ static NSArray *_sourceTypes = nil; -(void)commonInit { - NSLog(@"COMMON INIT %@", self); [CATransaction begin]; self.name = nil; _nextImageTime = 0.0f; @@ -1476,7 +1475,6 @@ static NSArray *_sourceTypes = nil; -(void)dealloc { - NSLog(@"INPUT SOURCE DEALLOC"); [self deregisterVideoInput:self.videoInput]; for(id vInput in self.videoSources) { @@ -2150,7 +2148,6 @@ static NSArray *_sourceTypes = nil; if (!self.videoInput || NSEqualSizes(NSZeroSize, self.videoInput.captureSize)) { - NSLog(@"NO SIZE FOR RESET"); return; } @@ -2167,7 +2164,6 @@ static NSArray *_sourceTypes = nil; resize_style resizeSave = self.resizeType; self.resizeType = kResizeTop | kResizeRight | kResizeFree; - NSLog(@"NEW SIZE %f %f", width, height); [self updateSize:width height:height]; self.resizeType = resizeSave; } @@ -3549,7 +3545,6 @@ static NSArray *_sourceTypes = nil; { if (self.videoInput) { - NSLog(@"RETURNING VIDEO INPUT DURATION %@ %f", self.videoInput, self.videoInput.duration); return self.videoInput.duration; } diff --git a/CocoaSplit/Interface/CSInputLibraryWindowController.m b/CocoaSplit/Interface/CSInputLibraryWindowController.m index aa63205f..79ce59e4 100644 --- a/CocoaSplit/Interface/CSInputLibraryWindowController.m +++ b/CocoaSplit/Interface/CSInputLibraryWindowController.m @@ -208,7 +208,6 @@ //self.editLayout.canvas_width = parent_width; //self.editLayout.canvas_height = parent_height; - NSLog(@"PARENT WIDTH %f HEIGHT %f", parent_width, parent_height); //[self.editLayout addSource:iSrc]; diff --git a/CocoaSplit/Interface/CSLayoutCollectionItem.m b/CocoaSplit/Interface/CSLayoutCollectionItem.m index bee57dd8..9b0ba80a 100644 --- a/CocoaSplit/Interface/CSLayoutCollectionItem.m +++ b/CocoaSplit/Interface/CSLayoutCollectionItem.m @@ -19,7 +19,6 @@ -(void)setRepresentedObject:(id)representedObject { [super setRepresentedObject:representedObject]; - NSLog(@"SET REPRESENTED OBJECT %@", representedObject); [self.representedObject addObserver:self forKeyPath:@"in_live" options:NSKeyValueObservingOptionNew context:NULL]; [self.representedObject addObserver:self forKeyPath:@"in_staging" options:NSKeyValueObservingOptionNew context:NULL]; @@ -32,8 +31,6 @@ AppDelegate *appDel = [NSApp delegate]; self.captureController = appDel.captureController; - NSLog(@"LAYOUT BUTTON %@", self.layoutButton); - NSLog(@"REPRESENT AWAKE %@", self.representedObject); diff --git a/CocoaSplit/Interface/CompressionSettingsPanelController.m b/CocoaSplit/Interface/CompressionSettingsPanelController.m index e09cb0ad..ac6c87b4 100644 --- a/CocoaSplit/Interface/CompressionSettingsPanelController.m +++ b/CocoaSplit/Interface/CompressionSettingsPanelController.m @@ -68,7 +68,6 @@ -(void)saveCompressPanel { - NSLog(@"SAVING COMPRESS PANEL %@ %@", self.compressorObjectController, self.compressorViewController); [self.compressorObjectController commitEditing]; [self.compressorViewController commitEditing]; [self.window.sheetParent endSheet:self.window returnCode:NSModalResponseOK]; diff --git a/CocoaSplit/JSExports/CSJSProxyObj.m b/CocoaSplit/JSExports/CSJSProxyObj.m index 62cf7632..fd27bd93 100644 --- a/CocoaSplit/JSExports/CSJSProxyObj.m +++ b/CocoaSplit/JSExports/CSJSProxyObj.m @@ -53,7 +53,6 @@ BOOL tmp; [invocation getArgument:&tmp atIndex:idx]; [argArray addObject:@(tmp)]; - NSLog(@"BOOL ARG IS %hhd", tmp); } else if (ISARGUMENTTYPE(char, aType)) { char tmp; @@ -112,11 +111,8 @@ id tmp; [invocation getArgument:&tmp atIndex:idx]; [argArray addObject:tmp]; - NSLog(@"TMP IS %@", tmp); } else { - - NSLog(@"UNSUPPORTED TYPE"); [argArray addObject:@(0)]; } } @@ -177,7 +173,6 @@ NSString *jsFunction = [self mangleName:selName]; - NSLog(@"CALL JSFUNCTION %@", jsFunction); if (!self.jsObject[jsFunction].isUndefined) { NSArray *argArray = [self argumentListForInvocation:anInvocation]; @@ -207,7 +202,6 @@ if (!self.jsObject[jsFunction].isUndefined) { - NSLog(@"DID IMPLEMENT"); return YES; } diff --git a/CocoaSplit/LayoutRenderer.m b/CocoaSplit/LayoutRenderer.m index 167a3560..7828b7ba 100644 --- a/CocoaSplit/LayoutRenderer.m +++ b/CocoaSplit/LayoutRenderer.m @@ -115,8 +115,6 @@ glLoadIdentity(); glOrtho(0, _cvpool_size.width, 0,_cvpool_size.height, -1, 1); - NSLog(@"CVPOOL %@", NSStringFromSize(_cvpool_size)); - glMatrixMode(GL_MODELVIEW); glLoadIdentity(); @@ -312,7 +310,6 @@ -(bool) createPixelBufferPoolForSize:(NSSize) size { - NSLog(@"Controller: Creating Pixel Buffer Pool %f x %f LAYOUT %@", size.width, size.height, self.layout); NSMutableDictionary *attributes = [NSMutableDictionary dictionary]; [attributes setValue:[NSNumber numberWithInt:size.width] forKey:(NSString *)kCVPixelBufferWidthKey]; diff --git a/CocoaSplit/PreviewView.m b/CocoaSplit/PreviewView.m index 4099c9f0..a6c6276e 100644 --- a/CocoaSplit/PreviewView.m +++ b/CocoaSplit/PreviewView.m @@ -1400,7 +1400,6 @@ { InputSource *newSource = toClone.copy; [self.sourceLayout addSource:newSource]; - NSLog(@"NEW SOURCE UUID %@ PARENT %@", newSource.uuid, toClone.uuid); [[self.undoManager prepareWithInvocationTarget:self] undoCloneInput:newSource.uuid parentUUID:toClone.uuid]; } diff --git a/CocoaSplit/SourceLayout.m b/CocoaSplit/SourceLayout.m index 8c5918c3..af9cf1aa 100644 --- a/CocoaSplit/SourceLayout.m +++ b/CocoaSplit/SourceLayout.m @@ -80,8 +80,6 @@ JS_EXPORT void JSSynchronousGarbageCollectForDebugging(JSContextRef ctx); JSValue *scriptFunc = jsCtx[@"runTriggerScriptInput"]; if (scriptFunc) { - NSLog(@"CALLING FOR %@ LAYER %@", input, input.layer); - [scriptFunc callWithArguments:@[input, scriptName]]; } } diff --git a/QTCaptureHelper/XPCListenerDelegate.m b/QTCaptureHelper/XPCListenerDelegate.m index b1d668b0..227cf5c0 100644 --- a/QTCaptureHelper/XPCListenerDelegate.m +++ b/QTCaptureHelper/XPCListenerDelegate.m @@ -213,7 +213,6 @@ void qt_xpc_list_devices(xpc_connection_t conn, xpc_object_t event) { NSArray *devices = [QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeVideo]; - NSLog(@"DEVICES IN HELPER %@", devices); QTCaptureDevice *devinstance;