* cleaning, reformatting, clarifying here and there...

modules/gui/macosx/AppleRemote.m

@@ -117,15 +117,6 @@ const NSTimeInterval HOLD_RECOGNITION_TIME_INTERVAL=0.4;
     [super dealloc];
 }
 
-/* this was added by the VideoLAN team to ensure Leopard-compatibility and is VLC-only */
-#if GC_ENABLED
-- (void)finalize
-{
-    [self stopListening: self];
-    [super finalize];
-}
-#endif
-
 - (int) remoteId {
     return remoteId;
 }

modules/gui/macosx/about.m

@@ -83,11 +83,11 @@ static VLAboutBox *_o_sharedInstance = nil;
 
         /* setup the creator / revision field */
         if( VLC_Changeset() != "exported" )
-        [o_revision_field setStringValue: [NSString stringWithFormat: \
-            _NS("Compiled by %s, based on SVN revision %s"), VLC_CompileBy(), \
-            VLC_Changeset()]];
+            [o_revision_field setStringValue:
+                [NSString stringWithFormat: _NS("Compiled by %s, based on SVN revision %s"), 
+                    VLC_CompileBy(), VLC_Changeset()]];
         else
-        [o_revision_field setStringValue: [NSString stringWithFormat: \
+        [o_revision_field setStringValue: [NSString stringWithFormat:
             _NS("Compiled by %s"), VLC_CompileBy()]];
  
         /* Setup the nameversion field */

modules/gui/macosx/applescript.h

 /*****************************************************************************
  * applescript.h: MacOS X AppleScript support
  *****************************************************************************
- * Copyright (C) 2002-2003 the VideoLAN team
+ * Copyright (C) 2002-2003, 2005, 2007 the VideoLAN team
  * $Id$
  *
  * Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
@@ -38,6 +38,6 @@
 *****************************************************************************/
 @interface NSApplication(ScriptSupport)
 
-- (BOOL) scriptFullscreenMode;
-- (void) setScriptFullscreenMode: (BOOL) mode;
+- (BOOL)scriptFullscreenMode;
+- (void)setScriptFullscreenMode: (BOOL)mode;
 @end

modules/gui/macosx/applescript.m

 /*****************************************************************************
  * applescript.m: MacOS X AppleScript support
  *****************************************************************************
- * Copyright (C) 2002-2003 the VideoLAN team
+ * Copyright (C) 2002-2003, 2005, 2007 the VideoLAN team
  * $Id$
  *
  * Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>

modules/gui/macosx/bookmarks.h

 /*****************************************************************************
  * bookmarks.h: MacOS X Bookmarks window
  *****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
+ * Copyright (C) 2005, 2007 the VideoLAN team
  * $Id$
  *
  * Authors: Felix Kühne <fkuehne@users.sf.net>

modules/gui/macosx/bookmarks.m

@@ -82,16 +82,6 @@ static VLCBookmarks *_o_sharedInstance = nil;
     [super dealloc];
 }
 
-#if GC_ENABLED
-- (void)finalize
-{
-    /* release old input even if GC is enabled on 10.5 */
-    if( p_old_input )
-        vlc_object_release( p_old_input );
-    [super finalize];
-}
-#endif
-
 - (void)initStrings
 {
     /* localise the items */

modules/gui/macosx/controls.h

 /*****************************************************************************
  * controls.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -83,17 +83,17 @@
 - (BOOL) isFullscreen;
 - (IBAction)windowAction:(id)sender;
 - (BOOL)keyEvent:(NSEvent *)o_event;
-- (void)scrollWheel:(NSEvent *)theEvent;
+- (void)scrollWheel: (NSEvent *)theEvent;
 
 - (void)setupVarMenuItem:(NSMenuItem *)o_mi
-                    target:(vlc_object_t *)p_object
-                    var:(const char *)psz_variable
-                    selector:(SEL)pf_callback;
+                  target:(vlc_object_t *)p_object
+                     var:(const char *)psz_variable
+                selector:(SEL)pf_callback;
 - (void)setupVarMenu:(NSMenu *)o_menu
-                    forMenuItem: (NSMenuItem *)o_parent
-                    target:(vlc_object_t *)p_object
-                    var:(const char *)psz_variable
-                    selector:(SEL)pf_callback;
+         forMenuItem: (NSMenuItem *)o_parent
+              target:(vlc_object_t *)p_object
+                 var:(const char *)psz_variable
+            selector:(SEL)pf_callback;
 - (IBAction)toggleVar:(id)sender;
 - (int)toggleVarThread:(id)_o_data;
 
@@ -116,8 +116,10 @@
     int i_type;
 }
 
-- (id)initWithVar: (const char *)_psz_name Object: (int)i_id
-        Value: (vlc_value_t)val ofType: (int)_i_type;
+- (id)initWithVar: (const char *)_psz_name 
+           Object: (int)i_id
+            Value: (vlc_value_t)val 
+           ofType: (int)_i_type;
 - (char *)name;
 - (int)objectID;
 - (vlc_value_t)value;

modules/gui/macosx/controls.m

 /*****************************************************************************
  * controls.m: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>

modules/gui/macosx/embeddedwindow.h

 /*****************************************************************************
  * embeddedwindow.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2005-2006 the VideoLAN team
+ * Copyright (C) 2005-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Benjamin Pracht <bigben at videolan dot org>
@@ -52,9 +52,9 @@
     NSRecursiveLock * o_animation_lock;
 }
 
-- (void)setTime:(NSString *)o_arg_ime position:(float)f_position;
-- (void)playStatusUpdated:(int)i_status;
-- (void)setSeekable:(BOOL)b_seekable;
+- (void)setTime: (NSString *)o_arg_ime position: (float)f_position;
+- (void)playStatusUpdated: (int)i_status;
+- (void)setSeekable: (BOOL)b_seekable;
 
 - (NSView *)mainView;
 

modules/gui/macosx/embeddedwindow.m

 /*****************************************************************************
  * embeddedwindow.m: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2005-2006 the VideoLAN team
+ * Copyright (C) 2005-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Benjamin Pracht <bigben at videolan dot org>

modules/gui/macosx/equalizer.h

 /*****************************************************************************
  * equalizer.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2004-2006 the VideoLAN team
+ * Copyright (C) 2004-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Jérôme Decoodt <djc@videolan.org>
@@ -55,9 +55,9 @@
 - (void)windowWillClose:(NSNotification *)aNotification;
 - (void)awakeFromNib;
 
-- (void)setValue:(float)value forSlider:(int)index;
-- (id)getSliderByIndex:(int)index;
-- (void)setBandSlidersValues:(float *)values;
+- (void)setValue: (float)value forSlider: (int)index;
+- (id)getSliderByIndex: (int)index;
+- (void)setBandSlidersValues: (float *)values;
 - (void)initBandSliders;
 
 

modules/gui/macosx/fspanel.h

@@ -46,31 +46,31 @@
 
 - (void)setPlay;
 - (void)setPause;
-- (void)setStreamTitle:(NSString *)o_title;
-- (void)setStreamPos:(float) f_pos andTime:(NSString *)o_time;
-- (void)setSeekable:(BOOL) b_seekable;
+- (void)setStreamTitle: (NSString *)o_title;
+- (void)setStreamPos: (float)f_pos andTime: (NSString *)o_time;
+- (void)setSeekable: (BOOL)b_seekable;
 - (void)setVolumeLevel: (float)f_volumeLevel;
 
-- (void)setNonActive:(id)noData;
-- (void)setActive:(id)noData;
+- (void)setNonActive: (id)noData;
+- (void)setActive: (id)noData;
 
-- (void)focus:(NSTimer *)timer;
-- (void)unfocus:(NSTimer *)timer;
-- (void)mouseExited:(NSEvent *)theEvent;
+- (void)focus: (NSTimer *)timer;
+- (void)unfocus: (NSTimer *)timer;
+- (void)mouseExited: (NSEvent *)theEvent;
 
 - (void)fadeIn;
 - (void)fadeOut;
 
 - (NSTimer *)fadeTimer;
-- (void)setFadeTimer:(NSTimer *)timer;
+- (void)setFadeTimer: (NSTimer *)timer;
 - (void)autoHide;
-- (void)keepVisible:(NSTimer *)timer;
+- (void)keepVisible: (NSTimer *)timer;
 
-- (void)mouseDown:(NSEvent *)theEvent;
-- (void)mouseDragged:(NSEvent *)theEvent;
+- (void)mouseDown: (NSEvent *)theEvent;
+- (void)mouseDragged: (NSEvent *)theEvent;
 
 - (BOOL)isDisplayed;
-- (void)setVoutWasUpdated: (int) i_screen;
+- (void)setVoutWasUpdated: (int)i_screen;
 @end
 
 @interface VLCFSPanelView : NSView
@@ -80,8 +80,8 @@
     NSTextField *o_streamTitle_txt, *o_streamPosition_txt;
     NSSlider *o_fs_timeSlider, *o_fs_volumeSlider;
 }
-- (id)initWithFrame:(NSRect)frameRect;
-- (void)drawRect:(NSRect)rect;
+- (id)initWithFrame: (NSRect)frameRect;
+- (void)drawRect: (NSRect)rect;
 
 - (void)setPlay;
 - (void)setPause;
@@ -94,23 +94,23 @@
 - (IBAction)next:(id)sender;
 - (IBAction)forward:(id)sender;
 - (IBAction)backward:(id)sender;
-- (IBAction)fsTimeSliderUpdate:(id)sender;
-- (IBAction)fsVolumeSliderUpdate:(id)sender;
+- (IBAction)fsTimeSliderUpdate: (id)sender;
+- (IBAction)fsVolumeSliderUpdate: (id)sender;
 
 @end
 
 @interface VLCFSTimeSlider : NSSlider
 {
 }
-- (void)drawKnobInRect:(NSRect)knobRect;
-- (void)drawRect:(NSRect)rect;
+- (void)drawKnobInRect: (NSRect)knobRect;
+- (void)drawRect: (NSRect)rect;
 
 @end
 
 @interface VLCFSVolumeSlider : NSSlider
 {
 }
-- (void)drawKnobInRect:(NSRect)knobRect;
-- (void)drawRect:(NSRect)rect;
+- (void)drawKnobInRect: (NSRect)knobRect;
+- (void)drawRect: (NSRect)rect;
 
 @end

modules/gui/macosx/fspanel.m

@@ -93,17 +93,6 @@
     return YES;
 }
 
-#if GC_ENABLED
-- (void)finalize
-{
-    /* dealloc isn't called on 10.5 in case that GC is enabled, so we need to provide the functionality here */
-    [[NSNotificationCenter defaultCenter] removeObserver: self];
-    [self setFadeTimer:nil];
-    
-    [super finalize];
-}
-#endif
-
 -(void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver: self];

modules/gui/macosx/interaction.m

@@ -94,16 +94,6 @@
     return o_error_panel;
 }
 
-#if GC_ENABLED
--(void)finalize
-{
-    /* dealloc doesn't get called on 10.5 if GC is enabled, so we need to provide the basic functionality here */
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-    [o_interaction_list removeAllObjects];
-    [super finalize];
-}
-#endif
-
 -(void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -278,7 +268,7 @@
 {
     if( p_dialog->i_flags & DIALOG_USER_PROGRESS )
     {
-        [o_prog_description setStringValue: \
+        [o_prog_description setStringValue:
             [NSString stringWithUTF8String: p_dialog->psz_description]];
         [o_prog_bar setDoubleValue: (double)p_dialog->val.f_float];
 

modules/gui/macosx/intf.h

@@ -51,9 +51,6 @@ unsigned int CocoaKeyToVLC( unichar i_key );
             @"/System/Library/CoreServices/SystemVersion.plist"] \
             objectForKey: @"ProductVersion"] floatValue]
 
-/* switch this to 1, if you want to use Obj-C with GC */
-#define GC_ENABLED 0
-
 /*****************************************************************************
  * intf_sys_t: description and status of the interface
  *****************************************************************************/
@@ -106,14 +103,14 @@ struct intf_sys_t
     id o_sfilters;              /* VLCsFilters    */
     id o_update;                /* VLCUpdate      */
     id o_eyetv;                 /* VLCEyeTVController */
-    BOOL nib_main_loaded;       /* reference to the main-nib */
-    BOOL nib_open_loaded;       /* reference to the open-nib */
-    BOOL nib_about_loaded;      /* reference to the about-nib */
-    BOOL nib_wizard_loaded;     /* reference to the wizard-nib */
-    BOOL nib_extended_loaded;   /* reference to the extended-nib */
-    BOOL nib_bookmarks_loaded;  /* reference to the bookmarks-nib */
-    BOOL nib_sfilters_loaded;   /* reference to the sfilters-nib */
-    BOOL nib_update_loaded;     /* reference to the update-nib */
+    BOOL nib_main_loaded;       /* main nibfile */
+    BOOL nib_open_loaded;       /* open nibfile */
+    BOOL nib_about_loaded;      /* about nibfile */
+    BOOL nib_wizard_loaded;     /* wizard nibfile */
+    BOOL nib_extended_loaded;   /* extended nibfile */
+    BOOL nib_bookmarks_loaded;  /* bookmarks nibfile */
+    BOOL nib_sfilters_loaded;   /* sfilters nibfile */
+    BOOL nib_update_loaded;     /* update nibfile */
 
     IBOutlet id o_window;       /* main window    */
     IBOutlet id o_playlist_view;/* playlist view  */
@@ -125,14 +122,14 @@ struct intf_sys_t
     float f_slider_old;         /* old slider val */
     IBOutlet id o_volumeslider; /* volume slider  */
 
-    IBOutlet id o_main_pgbar;   /* main interface progress bar */
+    IBOutlet id o_main_pgbar;   /* playlist window progress bar */
     IBOutlet id o_btn_prev;     /* btn previous   */
     IBOutlet id o_btn_rewind;   /* btn rewind     */
     IBOutlet id o_btn_play;     /* btn play       */
     IBOutlet id o_btn_stop;     /* btn stop       */
     IBOutlet id o_btn_ff;       /* btn fast forward     */
     IBOutlet id o_btn_next;     /* btn next       */
-    IBOutlet id o_btn_fullscreen;/* btn fullscreen      */
+    IBOutlet id o_btn_fullscreen;/* btn fullscreen (embedded vout window) */
     IBOutlet id o_btn_playlist; /* btn playlist   */
 
     NSImage * o_img_play;       /* btn play img   */

modules/gui/macosx/misc.h

 /*****************************************************************************
  * misc.h: code not specific to vlc
  *****************************************************************************
- * Copyright (C) 2003 the VideoLAN team
+ * Copyright (C) 2003-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>

modules/gui/macosx/misc.m

@@ -381,15 +381,6 @@ static NSMutableArray *blackoutWindows = NULL;
     [super dealloc];
 }
 
-#if GC_ENABLED
-- (void)finalize
-{
-    /* dealloc doesn't get called on 10.5 if GC is enabled, so we need to provide the basic functionality here */
-    [self unregisterDraggedTypes];
-    [super finalize];
-}
-#endif
-
 - (void)awakeFromNib
 {
     [self registerForDraggedTypes:[NSArray arrayWithObjects:NSTIFFPboardType,
@@ -468,15 +459,6 @@ static NSMutableArray *blackoutWindows = NULL;
     [super dealloc];
 }
 
-#if GC_ENABLED
-- (void)finalize
-{
-    /* dealloc doesn't get called on 10.5 if GC is enabled, so we need to provide the basic functionality here */
-    [self unregisterDraggedTypes];
-    [super finalize];
-}
-#endif
-
 - (void)awakeFromNib
 {
     [self registerForDraggedTypes:[NSArray arrayWithObjects:NSTIFFPboardType,

modules/gui/macosx/open.h

 /*****************************************************************************
  * open.h: MacOS X module for vlc
  *****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -128,7 +128,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
 - (void)openFileGeneric;
 - (void)openFilePathChanged:(NSNotification *)o_notification;
 - (IBAction)openFileBrowse:(id)sender;
-- (void) pathChosenInPanel: (NSOpenPanel *) sheet withReturn:(int)returnCode contextInfo:(void  *)contextInfo;
+- (void)pathChosenInPanel: (NSOpenPanel *)sheet withReturn:(int)returnCode contextInfo:(void *)contextInfo;
 - (IBAction)openFileStreamChanged:(id)sender;
 
 - (void)openDisc;

modules/gui/macosx/output.h

 /*****************************************************************************
  * output.h: MacOS X Output Dialog
  *****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>

modules/gui/macosx/output.m

 /*****************************************************************************
  * output.m: MacOS X Output Dialog
  *****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>