diff options
Diffstat (limited to 'macosx')
29 files changed, 51 insertions, 51 deletions
diff --git a/macosx/HBAVPlayer.m b/macosx/HBAVPlayer.m index 940c5bdb6..5d4f17ab3 100644 --- a/macosx/HBAVPlayer.m +++ b/macosx/HBAVPlayer.m @@ -74,7 +74,7 @@ typedef void (^HBPlayableObverser)(void); }]; } - + return self; } diff --git a/macosx/HBApplication.m b/macosx/HBApplication.m index dcd934030..faf931368 100644 --- a/macosx/HBApplication.m +++ b/macosx/HBApplication.m @@ -26,7 +26,7 @@ static void CrashMyApplication() [result appendAttributedString:attrS]; } [result addAttribute:NSFontAttributeName value:[NSFont fontWithName:@"Monaco" size:10] range:NSMakeRange(0, result.length)]; - return result; + return result; } - (void)reportException:(NSException *)exception @@ -58,7 +58,7 @@ static void CrashMyApplication() @catch (NSException *e) { // Suppress any exceptions raised in the handling - } + } } @end diff --git a/macosx/HBAudioDefaults.m b/macosx/HBAudioDefaults.m index a59b55cef..a11a4f2e7 100644 --- a/macosx/HBAudioDefaults.m +++ b/macosx/HBAudioDefaults.m @@ -430,7 +430,7 @@ copy->_container = _container; copy->_secondaryEncoderMode = _secondaryEncoderMode; } - + return copy; } diff --git a/macosx/HBChapterTitlesController.m b/macosx/HBChapterTitlesController.m index 88b8cc954..7266e9aaf 100644 --- a/macosx/HBChapterTitlesController.m +++ b/macosx/HBChapterTitlesController.m @@ -3,7 +3,7 @@ This file is part of the HandBrake source code. Homepage: <http://handbrake.fr/>. It may be used under the terms of the GNU General Public License. */ - + #import "HBChapterTitlesController.h" #import "HBPreferencesKeys.h" @import HandBrakeKit; diff --git a/macosx/HBCore.m b/macosx/HBCore.m index e4df14cbd..4fd832b8c 100644 --- a/macosx/HBCore.m +++ b/macosx/HBCore.m @@ -332,7 +332,7 @@ typedef void (^HBCoreCleanupHandler)(void); } #pragma mark - Preview images - + - (CGImageRef)copyImageAtIndex:(NSUInteger)index forTitle:(HBTitle *)title pictureFrame:(HBPicture *)frame diff --git a/macosx/HBDVDDetector.h b/macosx/HBDVDDetector.h index 27b7fcf25..c4ef8f106 100644 --- a/macosx/HBDVDDetector.h +++ b/macosx/HBDVDDetector.h @@ -1,7 +1,7 @@ /** * HBDVDDetector.h * 8/17/2007 - * + * * This file is part of the HandBrake source code. * Homepage: <http://handbrake.fr/>. * It may be used under the terms of the GNU General Public License. diff --git a/macosx/HBDVDDetector.m b/macosx/HBDVDDetector.m index 106c3230a..6a0fc4e63 100644 --- a/macosx/HBDVDDetector.m +++ b/macosx/HBDVDDetector.m @@ -1,7 +1,7 @@ /** * HBDriveDetector.m * 8/17/2007 - * + * * This file is part of the HandBrake source code. * Homepage: <http://handbrake.fr/>. * It may be used under the terms of the GNU General Public License. @@ -36,7 +36,7 @@ - (HBDVDDetector *)initWithPath: (NSString *)aPath { NSAssert(aPath, @"nil string passed to drive detector."); - if( self = [super init] ) + if( self = [super init] ) { path = aPath; bsdName = nil; @@ -159,12 +159,12 @@ - (BOOL)isService: (io_service_t)service class:(const io_name_t)class { // Find the IOMedia object that represents the entire (whole) media that the - // volume is on. + // volume is on. // // If the volume is on partitioned media, the whole media object will be a // parent of the volume's media object. If the media is not partitioned, the // volume's media object will be the whole media object. - // + // // The whole media object is indicated in the IORegistry by the presence of // a property with the key "Whole" and value "Yes". @@ -208,15 +208,15 @@ // Determine if the object passed in represents an IOMedia (or subclass) object. // If it does, test the "Whole" property. // - + Boolean isWholeMedia = NO; - + if( IOObjectConformsTo(service, kIOMediaClass) ) { CFTypeRef wholeMedia; - wholeMedia = IORegistryEntryCreateCFProperty( service, - CFSTR(kIOMediaWholeKey), - kCFAllocatorDefault, + wholeMedia = IORegistryEntryCreateCFProperty( service, + CFSTR(kIOMediaWholeKey), + kCFAllocatorDefault, 0); if( !wholeMedia ) { diff --git a/macosx/HBDockTextField.h b/macosx/HBDockTextField.h index 0961311be..d4ea07888 100644 --- a/macosx/HBDockTextField.h +++ b/macosx/HBDockTextField.h @@ -1,5 +1,5 @@ /* HBDockTextField.h $ - + This file is part of the HandBrake source code. Homepage: <http://handbrake.fr/>. It may be used under the terms of the GNU General Public License. */ diff --git a/macosx/HBDockTextField.m b/macosx/HBDockTextField.m index 25d22b5b3..c26b25a94 100644 --- a/macosx/HBDockTextField.m +++ b/macosx/HBDockTextField.m @@ -1,5 +1,5 @@ /* HBDockTextField.m $ - + This file is part of the HandBrake source code. Homepage: <http://handbrake.fr/>. It may be used under the terms of the GNU General Public License. */ @@ -30,7 +30,7 @@ _smallTextAttributes = [self textAttributesWithFontSize:DOCK_TEXTFIELD_FONTSIZE - 2]; [self changeGradientColors:[NSColor grayColor] endColor:[NSColor blackColor]]; } - + return self; } diff --git a/macosx/HBExceptionAlertController.m b/macosx/HBExceptionAlertController.m index 5fc69dcbc..249f10772 100644 --- a/macosx/HBExceptionAlertController.m +++ b/macosx/HBExceptionAlertController.m @@ -3,7 +3,7 @@ This file is part of the HandBrake source code. Homepage: <http://handbrake.fr/>. It may be used under the terms of the GNU General Public License. */ - + #import "HBExceptionAlertController.h" @implementation HBExceptionAlertController diff --git a/macosx/HBJob+HBJobConversion.m b/macosx/HBJob+HBJobConversion.m index 8a7eb6c0a..f6197e73e 100644 --- a/macosx/HBJob+HBJobConversion.m +++ b/macosx/HBJob+HBJobConversion.m @@ -535,7 +535,7 @@ filter = hb_filter_init(HB_FILTER_VFR); hb_add_filter(job, filter, [[NSString stringWithFormat:@"mode=%d:rate=%d/%d", fps_mode, fps_num, fps_den] UTF8String]); - + return job; } diff --git a/macosx/HBJob+UIAdditions.m b/macosx/HBJob+UIAdditions.m index d6a9499b9..baa7d0f88 100644 --- a/macosx/HBJob+UIAdditions.m +++ b/macosx/HBJob+UIAdditions.m @@ -528,7 +528,7 @@ static HBMixdownTransformer *mixdownTransformer; [attrString appendString:lavcInfo withAttributes:detailAttr]; [attrString appendString:@"\n" withAttributes:detailAttr]; } - + return attrString; } diff --git a/macosx/HBLanguagesSelection.m b/macosx/HBLanguagesSelection.m index 018c84875..944222221 100644 --- a/macosx/HBLanguagesSelection.m +++ b/macosx/HBLanguagesSelection.m @@ -84,7 +84,7 @@ { [internal addObject:item]; } - + } // Insert the selected items @@ -198,7 +198,7 @@ NSString *kHBLanguagesDragRowsType = @"kHBLanguagesDragRowsType"; [pboard declareTypes:@[kHBLanguagesDragRowsType] owner:self]; [pboard setData:data forType:kHBLanguagesDragRowsType]; } - + return self.isDragginEnabled; } diff --git a/macosx/HBOutputPanelController.m b/macosx/HBOutputPanelController.m index 7d9b8c66c..ecfcc7de7 100644 --- a/macosx/HBOutputPanelController.m +++ b/macosx/HBOutputPanelController.m @@ -105,7 +105,7 @@ NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:text attributes:_textAttributes]; // Actually write the libhb output to the text view (outputTextStorage) [_outputTextStorage appendAttributedString:attributedString]; - + // remove text from outputTextStorage as defined by TextStorageUpperSizeLimit and TextStorageLowerSizeLimit */ if (_outputTextStorage.length > TextStorageUpperSizeLimit) { diff --git a/macosx/HBOutputRedirect.m b/macosx/HBOutputRedirect.m index 6e94c3747..82cd130ba 100644 --- a/macosx/HBOutputRedirect.m +++ b/macosx/HBOutputRedirect.m @@ -103,7 +103,7 @@ int stderrwrite(void *inFD, const char *buffer, int size) /** * Starts redirecting the stream by redirecting its output to function * @c stdoutwrite() or @c stderrwrite(). Old _write function is stored to - * @c oldWriteFunc so it can be restored. + * @c oldWriteFunc so it can be restored. */ - (void)startRedirect { diff --git a/macosx/HBPreset.m b/macosx/HBPreset.m index 81b0b51b2..013e11b9c 100644 --- a/macosx/HBPreset.m +++ b/macosx/HBPreset.m @@ -215,7 +215,7 @@ return [NSError errorWithDomain:@"HBPresetDomain" code:2 userInfo:@{NSLocalizedDescriptionKey: description, NSLocalizedRecoverySuggestionErrorKey: reason}]; - + } /** diff --git a/macosx/HBPresetsManager.h b/macosx/HBPresetsManager.h index 7fcc43292..0c11818d6 100644 --- a/macosx/HBPresetsManager.h +++ b/macosx/HBPresetsManager.h @@ -1,5 +1,5 @@ /* HBPresetsManager.h $ - + This file is part of the HandBrake source code. Homepage: <http://handbrake.fr/>. It may be used under the terms of the GNU General Public License. */ diff --git a/macosx/HBPresetsManager.m b/macosx/HBPresetsManager.m index ac2ea95c1..4692a37a6 100644 --- a/macosx/HBPresetsManager.m +++ b/macosx/HBPresetsManager.m @@ -1,5 +1,5 @@ /* HBPresets.m $ - + This file is part of the HandBrake source code. Homepage: <http://handbrake.fr/>. It may be used under the terms of the GNU General Public License. */ diff --git a/macosx/HBPreviewController.m b/macosx/HBPreviewController.m index 4d8e5ed11..586d7bb10 100644 --- a/macosx/HBPreviewController.m +++ b/macosx/HBPreviewController.m @@ -169,7 +169,7 @@ } [self switchStateToHUD:self.pictureHUD]; - + if (generator) { [self resizeToOptimalSize]; @@ -346,7 +346,7 @@ { controller.view.hidden = YES; } - + if (self.generator) { hud.view.hidden = NO; diff --git a/macosx/HBPreviewView.m b/macosx/HBPreviewView.m index 753fd09f4..4e7d81ae1 100644 --- a/macosx/HBPreviewView.m +++ b/macosx/HBPreviewView.m @@ -130,7 +130,7 @@ NSSize imageSize = NSMakeSize(CGImageGetWidth(self.image), CGImageGetHeight(self.image)); CGFloat backingScaleFactor = self.window.backingScaleFactor; CGFloat borderSize = self.showBorder ? BORDER_SIZE : 0; - + NSSize imageScaledSize = [self imageScaledSize:imageSize toFit:self.frame.size borderSize:borderSize scaleFactor:self.window.backingScaleFactor]; return (imageScaledSize.width - borderSize * 2) / imageSize.width * backingScaleFactor; @@ -175,16 +175,16 @@ // with double pixel count, but we don't // want to double the size of the video NSSize scaledSource = NSMakeSize(source.width / scaleFactor, source.height / scaleFactor); - + scaledSource.width += borderSize * 2; scaledSource.height += borderSize * 2; - + if (self.fitToView == YES || scaledSource.width > destination.width || scaledSource.height > destination.height) { // If the image is larger then the view or if we are in Fit to View mode, scale the image scaledSource = [self scaledSize:source toFit:destination]; } - + return scaledSource; } @@ -197,12 +197,12 @@ { CGFloat borderSize = self.showBorder ? BORDER_SIZE : 0; NSSize frameSize = self.frame.size; - + NSSize imageScaledSize = [self imageScaledSize:imageSize toFit:frameSize borderSize:borderSize scaleFactor:self.window.backingScaleFactor]; - + [CATransaction begin]; CATransaction.disableActions = YES; @@ -216,7 +216,7 @@ self.backLayer.frame = alignedRect; self.pictureLayer.frame = NSInsetRect(alignedRect, borderSize, borderSize); - + [CATransaction commit]; } } diff --git a/macosx/HBQueueController.m b/macosx/HBQueueController.m index df47fea73..4a083c6d2 100644 --- a/macosx/HBQueueController.m +++ b/macosx/HBQueueController.m @@ -768,7 +768,7 @@ NSString * const HBQueueItemNotificationPathKey = @"HBQueueItemNotificationPathK [firstChild.view removeFromSuperviewWithoutNeedingDisplay]; [firstChild removeFromParentViewController]; } - + [self.containerViewController addChildViewController:viewController]; viewController.view.frame = self.containerViewController.view.bounds; viewController.view.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable; diff --git a/macosx/HBRange.m b/macosx/HBRange.m index 26b354395..c5183ed9b 100644 --- a/macosx/HBRange.m +++ b/macosx/HBRange.m @@ -216,7 +216,7 @@ NSString *HBRangeChangedNotification = @"HBRangeChangedNotification"; decodeInt(_frameStart); decodeInt(_frameStop); - + return self; fail: diff --git a/macosx/HBThumbnailItemView.h b/macosx/HBThumbnailItemView.h index b6b79aa9a..aaf8bdcd6 100644 --- a/macosx/HBThumbnailItemView.h +++ b/macosx/HBThumbnailItemView.h @@ -1,7 +1,7 @@ /* Copyright (C) 2017 Apple Inc. All Rights Reserved. See LICENSE.txt for this sample’s licensing information - + Abstract: Custom NSScrubberItemView used to display an image. */ diff --git a/macosx/HBThumbnailItemView.m b/macosx/HBThumbnailItemView.m index eb6e6646f..f20a56ae8 100644 --- a/macosx/HBThumbnailItemView.m +++ b/macosx/HBThumbnailItemView.m @@ -1,7 +1,7 @@ /* Copyright (C) 2017 Apple Inc. All Rights Reserved. See LICENSE.txt for this sample’s licensing information - + Abstract: Custom NSScrubberItemView used to display an image. */ @@ -31,7 +31,7 @@ [self addSubview:_imageView]; } - + return self; } diff --git a/macosx/HBTitle.m b/macosx/HBTitle.m index 653b63b4c..885f1c787 100644 --- a/macosx/HBTitle.m +++ b/macosx/HBTitle.m @@ -437,7 +437,7 @@ fail: _subtitlesTracks = [tracks copy]; } - + return _subtitlesTracks; } diff --git a/macosx/HBVideo+UIAdditions.m b/macosx/HBVideo+UIAdditions.m index cd9823698..07436f03f 100644 --- a/macosx/HBVideo+UIAdditions.m +++ b/macosx/HBVideo+UIAdditions.m @@ -208,7 +208,7 @@ { tmpString = @""; } - + return tmpString; } diff --git a/macosx/HandBrakeKitTests/HBDictTests.m b/macosx/HandBrakeKitTests/HBDictTests.m index 0327380c4..eed4d62ea 100644 --- a/macosx/HandBrakeKitTests/HBDictTests.m +++ b/macosx/HandBrakeKitTests/HBDictTests.m @@ -1,5 +1,5 @@ /* HBDictTests.m - + This file is part of the HandBrake source code. Homepage: <http://handbrake.fr/>. It may be used under the terms of the GNU General Public License. */ diff --git a/macosx/HandBrakeXPCService/main.m b/macosx/HandBrakeXPCService/main.m index d4321d44f..2cd50f602 100644 --- a/macosx/HandBrakeXPCService/main.m +++ b/macosx/HandBrakeXPCService/main.m @@ -21,7 +21,7 @@ newConnection.exportedObject = exportedObject; [newConnection resume]; - + return YES; } @@ -32,10 +32,10 @@ int main(int argc, const char *argv[]) HBUtilities.resolveBookmarks = NO; HBXPCServiceDelegate *delegate = [HBXPCServiceDelegate new]; - + NSXPCListener *listener = [NSXPCListener serviceListener]; listener.delegate = delegate; - + [listener resume]; return 0; diff --git a/macosx/NSWindow+HBAdditions.m b/macosx/NSWindow+HBAdditions.m index d783ee8bc..17eb5ba72 100644 --- a/macosx/NSWindow+HBAdditions.m +++ b/macosx/NSWindow+HBAdditions.m @@ -45,7 +45,7 @@ // sure that upon resize we do not have the window off the screen // So check the origin against the screen origin and adjust if // necessary. - + if (center.x == 0 && center.y == 0) { center = [self HB_centerPoint]; @@ -69,7 +69,7 @@ // the right side of the preview is off the screen, so shift to the left frame.origin.x = (screenOrigin.x + screenSize.width) - frame.size.width; } - + // our origin is off the screen to the bottom if (frame.origin.y < screenOrigin.y) { |