From f87d1e9e2e1d6ffd7adf685454305f1e0b8f414a Mon Sep 17 00:00:00 2001 From: Heiko Behrens Date: Wed, 1 Feb 2012 18:16:36 +0100 Subject: [PATCH] reduces console output --- CamHolderApp/CHDocument.m | 5 +++-- CamHolderApp/CHWindowController.m | 4 +--- CamHolderApp/UVCCameraControl.m | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CamHolderApp/CHDocument.m b/CamHolderApp/CHDocument.m index 53c310d..488bfcd 100644 --- a/CamHolderApp/CHDocument.m +++ b/CamHolderApp/CHDocument.m @@ -150,7 +150,8 @@ -(void)setIsAutoFocusActive:(BOOL)isAutoFocusActive_ { -(void)setFocusFactor:(float)focusFactor_ { focusFactor = MAX(0, MIN(1, focusFactor_)); - [_cameraControl setAbsoluteFocus:focusFactor]; + if(!self.isAutoFocusActive) + [_cameraControl setAbsoluteFocus:focusFactor]; } -(void)readCameraValuesIntoProperties { @@ -270,7 +271,7 @@ -(IBAction)toggleInspector:(id)sender { -(void)setContentSize:(NSSize)contentSize_ { contentSize = contentSize_; - NSLog(@"setContentSize: %@", NSStringFromSize(contentSize)); + //NSLog(@"setContentSize: %@", NSStringFromSize(contentSize)); } diff --git a/CamHolderApp/CHWindowController.m b/CamHolderApp/CHWindowController.m index 4aff0c7..0694df9 100644 --- a/CamHolderApp/CHWindowController.m +++ b/CamHolderApp/CHWindowController.m @@ -165,7 +165,7 @@ -(CHDocument *)document { } -(void)setDocument:(CHDocument *)document { - NSLog(@"setDocument: %@", document); + //NSLog(@"setDocument: %@", document); [self.document removeObserver:self forKeyPath:@"activeCaptureDevice"]; [self.document removeObserver:self forKeyPath:@"showsInspector"]; [self.document removeObserver:self forKeyPath:@"contentSize"]; @@ -297,12 +297,10 @@ -(void)setIsFullscreen:(BOOL)isFullscreen_ { -(void)finishSetIsFullscreenNo { - NSLog(@"probe"); if(!NSEqualRects(self.window.frame, _nonFullScreenFrame)) { [self performSelector:@selector(finishSetIsFullscreenNo) withObject:nil afterDelay:0.1]; return; } - NSLog(@"passed"); _ignoreWindowDidResize = NO; self.window.hasShadow = YES; [[NSApplication sharedApplication] setPresentationOptions:NSApplicationPresentationDefault]; diff --git a/CamHolderApp/UVCCameraControl.m b/CamHolderApp/UVCCameraControl.m index 3233c0f..15de58b 100644 --- a/CamHolderApp/UVCCameraControl.m +++ b/CamHolderApp/UVCCameraControl.m @@ -359,7 +359,6 @@ - (BOOL)setDiscreteValue:(float)value fromSet:(NSArray*)discreteValues forContro uvc_range_t range = [self getRangeForControl:control]; intval = [self mapValue:value fromMin:0 max:1 toMin:range.min max:range.max]; } - NSLog(@"inval: %5d", intval); return [self setData:intval withLength:control->size forSelector:control->selector at:control->unit]; }