macosx: removed tabs and fixed whitespacing errors

(cherry picked from commit cff6fc15)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

modules/access/eyetv.m

@@ -251,7 +251,8 @@ static void Close( vlc_object_t *p_this )
  
     msg_Dbg( p_access, "plugin notified" );
 
-	close(p_sys->eyetvSock);
+
+close(p_sys->eyetvSock);
  
     msg_Dbg( p_access, "msg port closed and freed" );
  

modules/access/qtcapture.m

@@ -141,7 +141,8 @@ vlc_module_end ()
 {
     CVImageBufferRef imageBuffer;
     mtime_t pts;
-	void * pixels;
+
+void * pixels;
 
     if(!currentImageBuffer || currentPts == previousPts )
         return 0;

modules/gui/macosx/AppleRemote.h

@@ -74,8 +74,11 @@ enum AppleRemoteEventIdentifier
     kRemoteControl_Switched         =1<<11,
     kRemoteButtonVolume_Plus_Hold   =1<<12,
     kRemoteButtonVolume_Minus_Hold  =1<<13,
-    k2009RemoteButtonPlay			=1<<14,
-    k2009RemoteButtonFullscreen		=1<<15
+    k2009RemoteButtonPlay
+
+   =1<<14,
+    k2009RemoteButtonFullscreen
+ =1<<15
 };
 typedef enum AppleRemoteEventIdentifier AppleRemoteEventIdentifier;
 

modules/gui/macosx/MainMenu.m

@@ -878,6 +878,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
     bool b_value;
     playlist_t *p_playlist = pl_Get( VLCIntf );
     b_value = var_GetBool( p_playlist, "random" );
+
     [o_mi_random setState: b_value];
 }
 
@@ -1242,7 +1243,9 @@ static VLCMainMenu *_o_sharedInstance = nil;
     if( [o_title isEqualToString: _NS("Normal Size")] )
     {
         NSMenuItem *item = [[o_mi menu] itemWithTitle:_NS("Teletext")];
-		bool b_telx = p_input && var_GetInteger( p_input, "teletext-es" ) >= 0;
+
+
+bool b_telx = p_input && var_GetInteger( p_input, "teletext-es" ) >= 0;
 
         [[item submenu] setAutoenablesItems:NO];
         for( int k=0; k < [[item submenu] numberOfItems]; k++ )

modules/gui/macosx/MainWindow.m

@@ -682,6 +682,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
     bool b_value;
     playlist_t *p_playlist = pl_Get( VLCIntf );
     b_value = var_GetBool( p_playlist, "random" );
+
     if(b_value) {
         [o_shuffle_btn setImage: o_shuffle_on_img];
         [o_shuffle_btn setAlternateImage: o_shuffle_on_pressed_img];
@@ -780,6 +781,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem
 {
     SEL s_menuAction = [menuItem action];
+
     if ((s_menuAction == @selector(performClose:)) || (s_menuAction == @selector(performMiniaturize:)) || (s_menuAction == @selector(performZoom:)))
             return YES;
 
@@ -788,7 +790,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
 
 - (BOOL)isMainWindow
 {
-	return YES;
+
+return YES;
 }
 
 - (void)setTitle:(NSString *)title
@@ -1975,24 +1978,20 @@ static VLCMainWindow *_o_sharedInstance = nil;
 - (NSUInteger)sourceList:(PXSourceList*)sourceList numberOfChildrenOfItem:(id)item
 {
     //Works the same way as the NSOutlineView data source: `nil` means a parent item
-	if(item==nil) {
+    if(item==nil)
         return [o_sidebaritems count];
-	}
-	else {
+    else
         return [[item children] count];
-	}
 }
 
 
 - (id)sourceList:(PXSourceList*)aSourceList child:(NSUInteger)index ofItem:(id)item
 {
     //Works the same way as the NSOutlineView data source: `nil` means a parent item
-	if(item==nil) {
+    if(item==nil)
         return [o_sidebaritems objectAtIndex:index];
-	}
-	else {
+    else
         return [[item children] objectAtIndex:index];
-	}
 }
 
 
@@ -2042,6 +2041,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 
         return i_playlist_size;
     }
+
     return [item badgeValue];
 }
 
@@ -2059,7 +2059,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
 
 - (NSMenu*)sourceList:(PXSourceList*)aSourceList menuForEvent:(NSEvent*)theEvent item:(id)item
 {
-	if ([theEvent type] == NSRightMouseDown || ([theEvent type] == NSLeftMouseDown && ([theEvent modifierFlags] & NSControlKeyMask) == NSControlKeyMask)) {
+    if ([theEvent type] == NSRightMouseDown || ([theEvent type] == NSLeftMouseDown && ([theEvent modifierFlags] & NSControlKeyMask) == NSControlKeyMask))
+    {
         if (item != nil)
         {
             NSMenu * m;
@@ -2077,6 +2078,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
             return [m autorelease];
         }
     }
+
     return nil;
 }
 
@@ -2109,9 +2111,11 @@ static VLCMainWindow *_o_sharedInstance = nil;
 - (void)sourceListSelectionDidChange:(NSNotification *)notification
 {
     playlist_t * p_playlist = pl_Get( VLCIntf );
+
     NSIndexSet *selectedIndexes = [o_sidebar_view selectedRowIndexes];
     id item = [o_sidebar_view itemAtRow:[selectedIndexes firstIndex]];
 
+
     //Set the label text to represent the new selection
     if ([item sdtype] > -1 && [[item identifier] length] > 0)
     {

modules/gui/macosx/SPInvocationGrabbing.m

@@ -28,17 +28,18 @@
 -(id)initWithObject:(id)obj stacktraceSaving:(BOOL)saveStack;
 {
     self.object = obj;
-
     if(saveStack)
         [self saveBacktrace];
 
     return self;
 }
+
 -(void)dealloc;
 {
     free(frameStrings);
     self.object = nil;
     self.invocation = nil;
+
     [super dealloc];
 }
 @synthesize invocation = _invocation, object = _object;
@@ -66,6 +67,7 @@
     else if(onMainAfterForward)
         [self performSelectorOnMainThread:@selector(invoke) withObject:nil waitUntilDone:waitUntilDone];
 }
+
 - (NSMethodSignature *)methodSignatureForSelector:(SEL)inSelector {
     NSMethodSignature *signature = [super methodSignatureForSelector:inSelector];
     if (signature == NULL)
@@ -76,10 +78,10 @@
 
 - (void)invoke;
 {
-
     @try {
         [_invocation invoke];
     }
+
     @catch (NSException * e) {
         NSLog(@"SPInvocationGrabber's target raised %@:\n\t%@\nInvocation was originally scheduled at:", e.name, e);
         [self printBacktrace];
@@ -97,6 +99,7 @@
     frameCount = backtrace(&backtraceFrames[0], 128);
     frameStrings = backtrace_symbols(&backtraceFrames[0], frameCount);
 }
+
 -(void)printBacktrace;
 {
     for(int x = 3; x < frameCount; x++) {
@@ -111,22 +114,26 @@
 {
     return [[[SPInvocationGrabber alloc] initWithObject:self] autorelease];
 }
+
 -(id)invokeAfter:(NSTimeInterval)delta;
 {
     id grabber = [self grab];
     [NSTimer scheduledTimerWithTimeInterval:delta target:grabber selector:@selector(invoke) userInfo:nil repeats:NO];
     return grabber;
 }
+
 - (id)nextRunloop;
 {
     return [self invokeAfter:0];
 }
+
 -(id)inBackground;
 {
     SPInvocationGrabber *grabber = [self grab];
     grabber.backgroundAfterForward = YES;
     return grabber;
 }
+
 -(id)onMainAsync:(BOOL)async;
 {
     SPInvocationGrabber *grabber = [self grab];

modules/gui/macosx/SPMediaKeyTap.h

@@ -18,15 +18,24 @@
 #define SPSystemDefinedEventMediaKeys 8
 
 @interface SPMediaKeyTap : NSObject {
-	EventHandlerRef _app_switching_ref;
-	EventHandlerRef _app_terminating_ref;
-	CFMachPortRef _eventPort;
-	CFRunLoopSourceRef _eventPortSource;
-	CFRunLoopRef _tapThreadRL;
-	BOOL _shouldInterceptMediaKeyEvents;
-	id _delegate;
-	// The app that is frontmost in this list owns media keys
-	NSMutableArray *_mediaKeyAppList;
+
+EventHandlerRef _app_switching_ref;
+
+EventHandlerRef _app_terminating_ref;
+
+CFMachPortRef _eventPort;
+
+CFRunLoopSourceRef _eventPortSource;
+
+CFRunLoopRef _tapThreadRL;
+
+BOOL _shouldInterceptMediaKeyEvents;
+
+id _delegate;
+
+// The app that is frontmost in this list owns media keys
+
+NSMutableArray *_mediaKeyAppList;
 }
 + (NSArray*)defaultMediaKeyUserBundleIdentifiers;
 

modules/gui/macosx/SideBarItem.h

@@ -22,20 +22,26 @@
   - SourceListItem *child1;
   - SourceListItem *child2;
      - SourceListItem *childOfChild2;
+
  - SourceListItem *anotherChildOfChild2;
   - SourceListItem *child3;
  
  */
 
 @interface SideBarItem : NSObject {
-	NSString *title;
-	NSString *identifier;
+
+NSString *title;
+
+NSString *identifier;
     NSString *untranslatedTitle;
-	NSImage *icon;
-	NSInteger badgeValue;
+
+NSImage *icon;
+
+NSInteger badgeValue;
     NSInteger sdtype;
 
-	NSArray *children;
+
+NSArray *children;
 }
 
 @property (nonatomic, copy) NSString *title;

modules/gui/macosx/SideBarItem.m

@@ -48,6 +48,7 @@
 
 + (id)itemWithTitle:(NSString*)aTitle identifier:(NSString*)anIdentifier icon:(NSImage*)anIcon
 {
+
     SideBarItem *item = [[[SideBarItem alloc] init] autorelease];
 
     [item setTitle:aTitle];

modules/gui/macosx/open.m

@@ -186,9 +186,11 @@ static VLCOpen *_o_sharedMainInstance = nil;
 
     [o_capture_mode_pop removeAllItems];
     [o_capture_mode_pop addItemWithTitle: _NS("Capture Device")];
+
     // our screen capture module isn't Lion-compatible, so let's hide it from the user if needed (trac #4799)
     if( NSAppKitVersionNumber < 1115.2 )
         [o_capture_mode_pop addItemWithTitle: _NS("Screen")];
+
     [o_capture_mode_pop addItemWithTitle: @"EyeTV"];
     [o_screen_long_lbl setStringValue: _NS("This input allows you to save, stream or display your current screen contents.")];
     [o_screen_fps_lbl setStringValue: _NS("Frames per Second:")];
@@ -212,6 +214,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [self qtkvideoDevices];
     [o_qtk_device_pop removeAllItems];
     msg_Dbg( VLCIntf, "Found %lu capture devices", [qtkvideoDevices count] );
+    
     if([qtkvideoDevices count] >= 1)
     {
         if (!qtk_currdevice_uid) {
@@ -234,7 +237,6 @@ static VLCOpen *_o_sharedMainInstance = nil;
         [qtk_currdevice_uid release];
     }
 
-
     [self setSubPanel];
 
     [[NSNotificationCenter defaultCenter] addObserver: self
@@ -275,6 +277,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
     o_specialMediaFolders = [[NSMutableArray alloc] init];
     o_opticalDevices = [[NSMutableArray alloc] init];
     NSWorkspace *sharedWorkspace = [NSWorkspace sharedWorkspace];
+
     [[sharedWorkspace notificationCenter] addObserver:self selector:@selector(scanOpticalMedia:) name:NSWorkspaceDidMountNotification object:nil];
     [[sharedWorkspace notificationCenter] addObserver:self selector:@selector(scanOpticalMedia:) name:NSWorkspaceDidUnmountNotification object:nil];
     [self performSelector:@selector(scanOpticalMedia:) withObject:nil afterDelay:2.0];
@@ -455,16 +458,16 @@ static VLCOpen *_o_sharedMainInstance = nil;
 - (IBAction)qtkChanged:(id)sender
 {
     NSInteger i_selectedDevice = [o_qtk_device_pop indexOfSelectedItem];
+
     if (i_selectedDevice >= ([qtkvideoDevices count] - 1))
     {
         NSValue *sizes = [[[[qtkvideoDevices objectAtIndex:i_selectedDevice] formatDescriptions] objectAtIndex: 0] attributeForKey: QTFormatDescriptionVideoEncodedPixelsSizeAttribute];
-
         [o_capture_width_fld setIntValue: [sizes sizeValue].width];
         [o_capture_height_fld setIntValue: [sizes sizeValue].height];
         [o_capture_width_stp setIntValue: [o_capture_width_fld intValue]];
         [o_capture_height_stp setIntValue: [o_capture_height_fld intValue]];
-		qtk_currdevice_uid = [[(QTCaptureDevice *)[qtkvideoDevices objectAtIndex:i_selectedDevice] uniqueID]
-							  stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+        qtk_currdevice_uid = [[(QTCaptureDevice *)[qtkvideoDevices objectAtIndex:i_selectedDevice] uniqueID] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+
         [self setMRL:[NSString stringWithFormat:@"qtcapture://%@", qtk_currdevice_uid]];
     }
 }
@@ -806,7 +809,8 @@ static VLCOpen *_o_sharedMainInstance = nil;
         return;
 
     unsigned int index = [n_index intValue];
-	id o_currentOpticalDevice = [o_opticalDevices objectAtIndex: index];
+
+id o_currentOpticalDevice = [o_opticalDevices objectAtIndex: index];
     char *diskType = [self getVolumeTypeFromMountPath:o_currentOpticalDevice];
 
     if (diskType == kVLCMediaDVD || diskType == kVLCMediaVideoTSFolder)

modules/gui/macosx/simple_prefs.h

@@ -92,8 +92,10 @@
     IBOutlet id o_intf_art_txt;
     IBOutlet id o_intf_embedded_ckb;
     IBOutlet id o_intf_fspanel_ckb;
-	IBOutlet id o_intf_appleremote_ckb;
-	IBOutlet id o_intf_mediakeys_ckb;
+
+IBOutlet id o_intf_appleremote_ckb;
+
+IBOutlet id o_intf_mediakeys_ckb;
     IBOutlet id o_intf_lang_pop;
     IBOutlet id o_intf_lang_txt;
     IBOutlet id o_intf_network_box;

modules/gui/macosx/simple_prefs.m

@@ -271,7 +271,9 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
     [o_intf_fspanel_ckb setTitle: _NS("Show Fullscreen Controller")];
     [o_intf_lang_txt setStringValue: _NS("Language")];
     [o_intf_network_box setTitle: _NS("Privacy / Network Interaction")];
+
     [o_intf_appleremote_ckb setTitle: _NS("Control playback with the Apple Remote")];
+
     [o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")];
     [o_intf_update_ckb setTitle: _NS("Automatically check for updates")];
     [o_intf_last_update_lbl setStringValue: @""];
@@ -463,8 +465,10 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
     [self setupButton: o_intf_fspanel_ckb forBoolValue: "macosx-fspanel"];
     [self setupButton: o_intf_nativefullscreen_ckb forBoolValue: "macosx-nativefullscreenmode"];
     [self setupButton: o_intf_embedded_ckb forBoolValue: "embedded-video"];
-	[self setupButton: o_intf_appleremote_ckb forBoolValue: "macosx-appleremote"];
-	[self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
+
+[self setupButton: o_intf_appleremote_ckb forBoolValue: "macosx-appleremote"];
+
+[self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
     if( [[SUUpdater sharedUpdater] lastUpdateCheckDate] != NULL )
         [o_intf_last_update_lbl setStringValue: [NSString stringWithFormat: _NS("Last check on: %@"), [[[SUUpdater sharedUpdater] lastUpdateCheckDate] descriptionWithLocale: [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]]]];
     else
@@ -814,6 +818,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
 
         config_PutInt( p_intf, "macosx-fspanel", [o_intf_fspanel_ckb state] );
         config_PutInt( p_intf, "embedded-video", [o_intf_embedded_ckb state] );
+
         config_PutInt( p_intf, "macosx-appleremote", [o_intf_appleremote_ckb state] );
         config_PutInt( p_intf, "macosx-mediakeys", [o_intf_mediakeys_ckb state] );
         config_PutInt( p_intf, "macosx-interfacestyle", [o_intf_style_dark_bcell state] );
@@ -1319,7 +1324,6 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
             [o_hotkeys_change_taken_lbl setStringValue: [NSString stringWithFormat:
                                                          _NS("This combination is already taken by \"%@\"."),
                                                          [o_hotkeyDescriptions objectAtIndex: i_returnValue2]]];
-        
         else
             [o_hotkeys_change_taken_lbl setStringValue: @""];
 
@@ -1359,6 +1363,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
 {
     NSMutableString *tempString = [[[NSMutableString alloc] init] autorelease];
     NSString *keyString = [o_theEvent characters];
+
     unichar key = [keyString characterAtIndex:0];
 
     /* modifiers */

modules/video_output/macosx.m

@@ -301,6 +301,7 @@ static void PictureDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *sub
     [sys->glView setVoutFlushing:NO];
     picture_Release (pic);
     sys->has_first_frame = true;
+
     (void)subpicture;
 }