macosx: move from manual to automatic property synthesis

modules/gui/macosx/AppleRemote.h

@@ -93,18 +93,12 @@ The class is not thread safe
     NSDictionary*   _cookieToButtonMapping;
     CFRunLoopSourceRef     eventSource;
 
-    BOOL _openInExclusiveMode;
-    BOOL _simulatePlusMinusHold;
-    BOOL _processesBacklog;
-
     /* state for simulating plus/minus hold */
     BOOL lastEventSimulatedHold;
     AppleRemoteEventIdentifier lastPlusMinusEvent;
     NSTimeInterval lastPlusMinusEventTime;
 
     int remoteId;
-    unsigned int _clickCountEnabledButtons;
-    NSTimeInterval _maxClickTimeDifference;
     NSTimeInterval lastClickCountEventTime;
     AppleRemoteEventIdentifier lastClickCountEvent;
     unsigned int eventClickCount;

modules/gui/macosx/AppleRemote.m

@@ -64,8 +64,6 @@ const NSTimeInterval HOLD_RECOGNITION_TIME_INTERVAL=0.4;
 
 @implementation AppleRemote
 
-@synthesize openInExclusiveMode = _openInExclusiveMode, clickCountEnabledButtons = _clickCountEnabledButtons, maximumClickCountTimeDifference = _maxClickTimeDifference, processesBacklog=_processesBacklog, simulatesPlusMinusHold = _simulatePlusMinusHold;
-
 #pragma public interface
 
 static AppleRemote *_o_sharedInstance = nil;
@@ -107,8 +105,8 @@ static AppleRemote *_o_sharedInstance = nil;
         _cookieToButtonMapping = [[NSDictionary alloc] initWithDictionary: mutableCookieToButtonMapping];
 
         /* defaults */
-        _simulatePlusMinusHold = YES;
-        _maxClickTimeDifference = DEFAULT_MAXIMUM_CLICK_TIME_DIFFERENCE;
+        _simulatesPlusMinusHold = YES;
+        _maximumClickCountTimeDifference = DEFAULT_MAXIMUM_CLICK_TIME_DIFFERENCE;
     }
 
     return _o_sharedInstance;
@@ -361,7 +359,7 @@ static AppleRemote* sharedInstance=nil;
             }
             [self performSelector: @selector(executeClickCountEvent:)
                        withObject: [NSArray arrayWithObjects: eventNumber, timeNumber, nil]
-                       afterDelay: _maxClickTimeDifference];
+                       afterDelay: _maximumClickCountTimeDifference];
         } else {
             [delegate appleRemoteButton:event pressedDown: pressedDown clickCount:1];
         }

modules/gui/macosx/BWQuincyManager.m

@@ -54,11 +54,6 @@
 
 @implementation BWQuincyManager
 
-@synthesize submissionURL = _submissionURL;
-@synthesize companyName = _companyName;
-@synthesize appIdentifier = _appIdentifier;
-@synthesize autoSubmitCrashReport = _autoSubmitCrashReport;
-
 + (BWQuincyManager *)sharedQuincyManager {
   static BWQuincyManager *quincyManager = nil;
 

modules/gui/macosx/ControlsBar.h

@@ -36,7 +36,6 @@
 
 @interface VLCControlsBarCommon : NSObject
 {
-    IBOutlet id o_bottombar_view;
     IBOutlet VLCDragDropView *o_drop_view;
 
     IBOutlet id o_play_btn;
@@ -54,7 +53,7 @@
     IBOutlet id o_resize_view;
 }
 
-@property (readonly) id bottomBarView;
+@property (readwrite, strong) IBOutlet id bottomBarView;
 @property (readonly) BOOL darkInterface;
 @property (readonly) BOOL nativeFullscreenMode;
 

modules/gui/macosx/ControlsBar.m

@@ -52,8 +52,6 @@
 
 @implementation VLCControlsBarCommon
 
-@synthesize bottomBarView=o_bottombar_view;
-
 - (void)awakeFromNib
 {
     _darkInterface = config_GetInt(VLCIntf, "macosx-interfacestyle");
@@ -87,7 +85,7 @@
     [[o_fullscreen_btn cell] accessibilitySetOverrideValue:[o_fullscreen_btn toolTip] forAttribute:NSAccessibilityTitleAttribute];
 
     if (!_darkInterface) {
-        [o_bottombar_view setImagesLeft: imageFromRes(@"bottom-background") middle: imageFromRes(@"bottom-background") right: imageFromRes(@"bottom-background")];
+        [self.bottomBarView setImagesLeft: imageFromRes(@"bottom-background") middle: imageFromRes(@"bottom-background") right: imageFromRes(@"bottom-background")];
 
         [o_bwd_btn setImage: imageFromRes(@"backward-3btns")];
         [o_bwd_btn setAlternateImage: imageFromRes(@"backward-3btns-pressed")];
@@ -104,7 +102,7 @@
         [o_fullscreen_btn setImage: imageFromRes(@"fullscreen-one-button")];
         [o_fullscreen_btn setAlternateImage: imageFromRes(@"fullscreen-one-button-pressed")];
     } else {
-        [o_bottombar_view setImagesLeft: imageFromRes(@"bottomdark-left") middle: imageFromRes(@"bottom-background_dark") right: imageFromRes(@"bottomdark-right")];
+        [self.bottomBarView setImagesLeft: imageFromRes(@"bottomdark-left") middle: imageFromRes(@"bottom-background_dark") right: imageFromRes(@"bottomdark-right")];
 
         [o_bwd_btn setImage: imageFromRes(@"backward-3btns-dark")];
         [o_bwd_btn setAlternateImage: imageFromRes(@"backward-3btns-dark-pressed")];
@@ -154,7 +152,7 @@
     if (!OSX_SNOW_LEOPARD)
         [o_resize_view setImage: NULL];
 
-    if ([[o_bottombar_view window] styleMask] & NSResizableWindowMask)
+    if ([[self.bottomBarView window] styleMask] & NSResizableWindowMask)
         [o_resize_view removeFromSuperviewWithoutNeedingDisplay];
 
 
@@ -180,7 +178,7 @@
 
 - (CGFloat)height
 {
-    return [o_bottombar_view frame].size.height;
+    return [self.bottomBarView frame].size.height;
 }
 
 - (void)toggleForwardBackwardMode:(BOOL)b_alt
@@ -707,7 +705,7 @@ else \
         }
     }
 
-    [o_bottombar_view setNeedsDisplay:YES];
+    [self.bottomBarView setNeedsDisplay:YES];
 }
 
 - (void)removeEffectsButton:(BOOL)b_fast
@@ -756,7 +754,7 @@ else \
         }
     }
 
-    [o_bottombar_view setNeedsDisplay:YES];
+    [self.bottomBarView setNeedsDisplay:YES];
 }
 
 - (void)toggleJumpButtons
@@ -861,11 +859,11 @@ else \
 
     // wait until the animation is done, if displayed
     if (b_fast) {
-        [o_bottombar_view addSubview:o_prev_btn];
-        [o_bottombar_view addSubview:o_next_btn];
+        [self.bottomBarView addSubview:o_prev_btn];
+        [self.bottomBarView addSubview:o_next_btn];
     } else {
-        [o_bottombar_view performSelector:@selector(addSubview:) withObject:o_prev_btn afterDelay:.2];
-        [o_bottombar_view performSelector:@selector(addSubview:) withObject:o_next_btn afterDelay:.2];
+        [self.bottomBarView performSelector:@selector(addSubview:) withObject:o_prev_btn afterDelay:.2];
+        [self.bottomBarView performSelector:@selector(addSubview:) withObject:o_next_btn afterDelay:.2];
     }
 
     [self toggleForwardBackwardMode: YES];
@@ -938,7 +936,7 @@ else \
 
     [self toggleForwardBackwardMode: NO];
 
-    [o_bottombar_view setNeedsDisplay:YES];
+    [self.bottomBarView setNeedsDisplay:YES];
 }
 
 - (void)togglePlaymodeButtons

modules/gui/macosx/ConvertAndSave.m

@@ -46,15 +46,9 @@
 
 @interface VLCConvertAndSave()
 {
-    NSString * _MRL;
-    NSString * _outputDestination;
-    NSArray * _profileNames;
-    NSArray * _profileValueList;
-    NSArray * _videoCodecs;
-    NSArray * _audioCodecs;
-    NSArray * _subsCodecs;
-    NSMutableArray * _currentProfile;
-
+    NSArray *_videoCodecs;
+    NSArray *_audioCodecs;
+    NSArray *_subsCodecs;
     BOOL b_streaming;
 }
 
@@ -71,10 +65,6 @@
 
 @implementation VLCConvertAndSave
 
-@synthesize MRL=_MRL, outputDestination=_outputDestination, profileNames=_profileNames, profileValueList=_profileValueList, currentProfile=_currentProfile;
-
-@synthesize vidBitrate, vidFramerate, audBitrate, audChannels;
-
 static VLCConvertAndSave *_o_sharedInstance = nil;
 
 #pragma mark -

modules/gui/macosx/ExtensionsManager.m

@@ -41,7 +41,6 @@
 
     NSMutableDictionary *p_extDict;
 
-    BOOL b_unloading;  ///< Work around threads + emit issues, see isUnloading
     BOOL b_failed; ///< Flag set to true if we could not load the module
 
     id <ExtensionsDelegate> delegate;
@@ -52,8 +51,6 @@
 
 static ExtensionsManager* instance = nil;
 
-@synthesize isUnloading = b_unloading;
-
 + (ExtensionsManager *)getInstance:(intf_thread_t *)_p_intf
 {
     if (!instance)
@@ -70,7 +67,7 @@ static ExtensionsManager* instance = nil;
 
         p_extDict = [[NSMutableDictionary alloc] init];
 
-        b_unloading = false;
+        _isUnloading = false;
         b_failed = false;
 
         delegate = nil;
@@ -203,7 +200,7 @@ static ExtensionsManager* instance = nil;
             [delegate extensionsUpdated];
             return false;
         }
-        b_unloading = false;
+        _isUnloading = false;
     }
     b_failed = false;
     [delegate extensionsUpdated];
@@ -214,7 +211,7 @@ static ExtensionsManager* instance = nil;
 {
     if (!p_extensions_manager)
         return;
-    b_unloading = true;
+    _isUnloading = true;
     module_unneed(p_extensions_manager, p_extensions_manager->p_module);
     vlc_object_release(p_extensions_manager);
     p_extensions_manager = NULL;
@@ -336,7 +333,7 @@ static ExtensionsManager* instance = nil;
 
 - (BOOL)cannotLoad
 {
-    return b_unloading || b_failed;
+    return self.isUnloading || b_failed;
 }
 
 @end

modules/gui/macosx/MainMenu.m

@@ -725,7 +725,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
 {
     BOOL b_value = !config_GetInt(VLCIntf, "macosx-show-effects-button");
     config_PutInt(VLCIntf, "macosx-show-effects-button", b_value);
-    [[[[VLCMain sharedInstance] mainWindow] controlsBar] toggleEffectsButton];
+    [(VLCMainWindowControlsBar *)[[[VLCMain sharedInstance] mainWindow] controlsBar] toggleEffectsButton];
     [o_mi_toggleEffectsButton setState: b_value];
 }
 
@@ -734,7 +734,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
     BOOL b_value = !config_GetInt(VLCIntf, "macosx-show-playback-buttons");
     config_PutInt(VLCIntf, "macosx-show-playback-buttons", b_value);
 
-    [[[[VLCMain sharedInstance] mainWindow] controlsBar] toggleJumpButtons];
+    [(VLCMainWindowControlsBar *)[[[VLCMain sharedInstance] mainWindow] controlsBar] toggleJumpButtons];
     [[[VLCMain sharedInstance] voutController] updateWindowsUsingBlock:^(VLCVideoWindowCommon *o_window) {
         [[o_window controlsBar] toggleForwardBackwardMode: b_value];
     }];
@@ -746,7 +746,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
 {
     BOOL b_value = !config_GetInt(VLCIntf, "macosx-show-playmode-buttons");
     config_PutInt(VLCIntf, "macosx-show-playmode-buttons", b_value);
-    [[[[VLCMain sharedInstance] mainWindow] controlsBar] togglePlaymodeButtons];
+    [(VLCMainWindowControlsBar *)[[[VLCMain sharedInstance] mainWindow] controlsBar] togglePlaymodeButtons];
     [o_mi_togglePlaymodeButtons setState: b_value];
 }
 

modules/gui/macosx/MainWindow.h

@@ -86,9 +86,7 @@ typedef enum {
 @property (readonly) BOOL nativeFullscreenMode;
 @property (readwrite) BOOL nonembedded;
 
-@property (readonly) VLCFSPanel* fsPanel;
-
-- (VLCMainWindowControlsBar *)controlsBar;
+@property (readonly) VLCFSPanel* fspanel;
 
 - (void)changePlaylistState:(VLCPlaylistStateEvent)event;
 

modules/gui/macosx/PLItem.m

@@ -26,32 +26,16 @@
 
 #pragma mark -
 
-@interface PLItem()
-{
-    input_item_t *p_input;
-
-    int _playlistId;
-    NSMutableArray *_children;
-
-    PLItem *_parent;
-}
-@end
-
 @implementation PLItem
 
-@synthesize children=_children;
-@synthesize plItemId=_playlistId;
-@synthesize input=p_input;
-@synthesize parent=_parent;
-
 - (id)initWithPlaylistItem:(playlist_item_t *)p_item;
 {
     self = [super init];
     if(self) {
-        _playlistId = p_item->i_id;
+        _plItemId = p_item->i_id;
 
-        p_input = p_item->p_input;
-        input_item_Hold(p_input);
+        _input = p_item->p_input;
+        input_item_Hold(_input);
         _children = [[NSMutableArray alloc] init];
     }
 
@@ -60,7 +44,7 @@
 
 - (void)dealloc
 {
-    input_item_Release(p_input);
+    input_item_Release(_input);
 }
 
 // own hash and isEqual methods are important to retain expandable state

modules/gui/macosx/PLModel.m

@@ -40,14 +40,9 @@
 
 @interface PLModel ()
 {
-    PLItem *_rootItem;
-
     playlist_t *p_playlist;
     NSOutlineView *_outlineView;
 
-    // TODO: write these objects to the pastboard properly?
-    NSMutableArray *_draggedItems;
-
     // TODO: for transition
     VLCPlaylist *_playlist;
 }
@@ -55,9 +50,6 @@
 
 @implementation PLModel
 
-@synthesize rootItem=_rootItem;
-@synthesize draggedItems=_draggedItems;
-
 #pragma mark -
 #pragma mark Init and Stuff
 

modules/gui/macosx/PXSourceList.h

@@ -15,8 +15,6 @@
 {
     id <PXSourceListDelegate> _secondaryDelegate; //Used to store the publicly visible delegate
     id <PXSourceListDataSource> _secondaryDataSource; //Used to store the publicly visible data source
-
-    NSSize _iconSize; //The size of icons in the Source List. Defaults to 16x16
 }
 
 @property (nonatomic) NSSize iconSize;

modules/gui/macosx/PXSourceList.m

@@ -49,7 +49,6 @@ NSString * const PXSLDeleteKeyPressedOnRowsNotification = @"PXSourceListDeleteKe
 #pragma mark -
 @implementation PXSourceList
 
-@synthesize iconSize = _iconSize;
 @dynamic dataSource;
 @dynamic delegate;
 

modules/gui/macosx/SPInvocationGrabbing.h

@@ -12,13 +12,8 @@
 #import <Foundation/Foundation.h>
 
 @interface SPInvocationGrabber : NSObject {
-    id _object;
-    NSInvocation *_invocation;
     int frameCount;
     char **frameStrings;
-    BOOL backgroundAfterForward;
-    BOOL onMainAfterForward;
-    BOOL waitUntilDone;
 }
 -(id)initWithObject:(id)obj;
 -(id)initWithObject:(id)obj stacktraceSaving:(BOOL)saveStack;

modules/gui/macosx/SPInvocationGrabbing.m

@@ -40,9 +40,7 @@
     self.object = nil;
     self.invocation = nil;
 }
-@synthesize invocation = _invocation, object = _object;
 
-@synthesize backgroundAfterForward, onMainAfterForward, waitUntilDone;
 - (void)runInBackground;
 {
     @autoreleasepool {
@@ -61,10 +59,10 @@
     anInvocation.target = _object;
     self.invocation = anInvocation;
 
-    if(backgroundAfterForward)
+    if(_backgroundAfterForward)
         [NSThread detachNewThreadSelector:@selector(runInBackground) toTarget:self withObject:nil];
-    else if(onMainAfterForward)
-        [self performSelectorOnMainThread:@selector(invoke) withObject:nil waitUntilDone:waitUntilDone];
+    else if(_onMainAfterForward)
+        [self performSelectorOnMainThread:@selector(invoke) withObject:nil waitUntilDone:_waitUntilDone];
 }
 
 - (NSMethodSignature *)methodSignatureForSelector:(SEL)inSelector {

modules/gui/macosx/SharedDialogs.m

@@ -26,16 +26,6 @@
 static VLCEnterTextPanel *_textPanelInstance = nil;
 static VLCSelectItemInPopupPanel *_selectItemPanelInstance = nil;
 
-@interface VLCEnterTextPanel()
-{
-    __unsafe_unretained NSString * _title;
-    __unsafe_unretained NSString * _subtitle;
-    __unsafe_unretained NSString * _okTitle;
-    __unsafe_unretained NSString * _cancelTitle;
-    __unsafe_unretained id _target;
-}
-@end
-
 @implementation VLCEnterTextPanel
 + (VLCEnterTextPanel *)sharedInstance
 {
@@ -50,8 +40,6 @@ static VLCSelectItemInPopupPanel *_selectItemPanelInstance = nil;
     return _textPanelInstance;
 }
 
-@synthesize title=_title, subTitle=_subtitle, OKButtonLabel=_okTitle, CancelButtonLabel=_cancelTitle, target=_target;
-
 - (IBAction)windowElementAction:(id)sender
 {
     [_panel orderOut:sender];
@@ -85,20 +73,7 @@ static VLCSelectItemInPopupPanel *_selectItemPanelInstance = nil;
 
 @end
 
-@interface VLCSelectItemInPopupPanel()
-{
-    __unsafe_unretained NSString * _title;
-    __unsafe_unretained NSString * _subtitle;
-    __unsafe_unretained NSString * _okTitle;
-    __unsafe_unretained NSString * _cancelTitle;
-    __unsafe_unretained NSArray * _popData;
-
-    __unsafe_unretained id _target;
-}
-@end
-
 @implementation VLCSelectItemInPopupPanel
-@synthesize title=_title, subTitle=_subtitle, OKButtonLabel=_okTitle, CancelButtonLabel=_cancelTitle, popupButtonContent=_popData, target=_target;
 
 + (VLCSelectItemInPopupPanel *)sharedInstance
 {

modules/gui/macosx/SideBarItem.h

@@ -28,21 +28,7 @@
 
  */
 
-@interface SideBarItem : NSObject {
-
-NSString *title;
-
-NSString *identifier;
-    NSString *untranslatedTitle;
-
-NSImage *icon;
-
-NSInteger badgeValue;
-    NSInteger sdtype;
-
-
-NSArray *children;
-}
+@interface SideBarItem : NSObject
 
 @property (nonatomic, copy) NSString *title;
 @property (nonatomic, copy) NSString *identifier;

modules/gui/macosx/SideBarItem.m

@@ -15,23 +15,14 @@
 
 @implementation SideBarItem
 
-@synthesize title;
-@synthesize untranslatedTitle;
-@synthesize identifier;
-@synthesize icon;
-@synthesize badgeValue;
-@synthesize children;
-@synthesize sdtype;
-
 #pragma mark -
 #pragma mark Init/Dealloc/Finalize
 
 - (id)init
 {
-    if(self=[super init])
-    {
-        badgeValue = -1; //We don't want a badge value by default
-        sdtype = -1; //no sd type set
+    if (self=[super init]) {
+        _badgeValue = -1; //We don't want a badge value by default
+        _sdtype = -1; //no sd type set
     }
 
     return self;
@@ -63,17 +54,17 @@
 
 - (BOOL)hasBadge
 {
-    return badgeValue!=-1;
+    return _badgeValue!=-1;
 }
 
 - (BOOL)hasChildren
 {
-    return [children count]>0;
+    return [_children count]>0;
 }
 
 - (BOOL)hasIcon
 {
-    return icon!=nil;
+    return _icon!=nil;
 }
 
 @end

modules/gui/macosx/VLCVoutWindowController.m

@@ -46,7 +46,6 @@
     // save the status level if at least one video window is on status level
     NSUInteger i_statusLevelWindowCounter;
     NSInteger i_currentWindowLevel;
-    NSInteger i_currentFloatingWindowLevel;
 
     BOOL b_mainwindow_has_video;
 }
@@ -60,7 +59,7 @@
     o_vout_dict = [[NSMutableDictionary alloc] init];
     o_keyboard_backlight = [[KeyboardBacklight alloc] init];
     i_currentWindowLevel = NSNormalWindowLevel;
-    i_currentFloatingWindowLevel = NSFloatingWindowLevel;
+    _currentStatusWindowLevel = NSFloatingWindowLevel;
     return self;
 }
 
@@ -420,22 +419,21 @@
 
     i_currentWindowLevel = i_level;
     if (i_level == NSNormalWindowLevel) {
-        i_currentFloatingWindowLevel = NSFloatingWindowLevel;
+        _currentStatusWindowLevel = NSFloatingWindowLevel;
     } else {
-        i_currentFloatingWindowLevel = i_level + 1;
+        _currentStatusWindowLevel = i_level + 1;
     }
 
-    [[VLCMainWindow sharedInstance] setWindowLevel:i_level];
+    NSInteger currentStatusWindowLevel = self.currentStatusWindowLevel;
 
-    [[VLCVideoEffects sharedInstance] updateCocoaWindowLevel:i_currentFloatingWindowLevel];
-    [[VLCAudioEffects sharedInstance] updateCocoaWindowLevel:i_currentFloatingWindowLevel];
-    [[[VLCMain sharedInstance] info] updateCocoaWindowLevel:i_currentFloatingWindowLevel];
-    [[VLCBookmarks sharedInstance] updateCocoaWindowLevel:i_currentFloatingWindowLevel];
-    [[VLCTrackSynchronization sharedInstance] updateCocoaWindowLevel:i_currentFloatingWindowLevel];
+    [[VLCMainWindow sharedInstance] setWindowLevel:i_level];
 
-    [[[VLCMain sharedInstance] resumeDialog] updateCocoaWindowLevel:i_currentFloatingWindowLevel];
+    [[VLCVideoEffects sharedInstance] updateCocoaWindowLevel:currentStatusWindowLevel];
+    [[VLCAudioEffects sharedInstance] updateCocoaWindowLevel:currentStatusWindowLevel];
+    [[[VLCMain sharedInstance] info] updateCocoaWindowLevel:currentStatusWindowLevel];
+    [[VLCBookmarks sharedInstance] updateCocoaWindowLevel:currentStatusWindowLevel];
+    [[VLCTrackSynchronization sharedInstance] updateCocoaWindowLevel:currentStatusWindowLevel];
+    [[[VLCMain sharedInstance] resumeDialog] updateCocoaWindowLevel:currentStatusWindowLevel];
 }
 
-@synthesize currentStatusWindowLevel=i_currentFloatingWindowLevel;
-
 @end

modules/gui/macosx/VideoEffects.m

@@ -41,13 +41,6 @@
 @implementation VLCVideoEffects
 static VLCVideoEffects *_o_sharedInstance = nil;
 
-@synthesize cropLeftValue, cropTopValue, cropRightValue, cropBottomValue;
-@synthesize puzzleRowsValue, puzzleColumnsValue;
-@synthesize wallRowsValue, wallColumnsValue;
-@synthesize cloneValue;
-@synthesize sepiaValue;
-@synthesize posterizeValue;
-
 + (VLCVideoEffects *)sharedInstance
 {
     return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init];

modules/gui/macosx/Windows.h

@@ -69,19 +69,15 @@ static const float f_min_video_height = 70.0;
  *****************************************************************************/
 
 @interface VLCVideoWindowCommon : VLCWindow <NSWindowDelegate, NSAnimationDelegate>
-{
-    IBOutlet VLCMainWindowTitleView *o_titlebar_view; // only set in main or detached window
-    IBOutlet __unsafe_unretained VLCVoutView *o_video_view;
-    IBOutlet VLCControlsBarCommon *o_controls_bar;
-}
-
-@property (nonatomic, assign) VLCVoutView* videoView;
-@property (readonly) VLCControlsBarCommon* controlsBar;
+
+@property (nonatomic, weak) IBOutlet VLCMainWindowTitleView *titlebarView; // only set in main or detached window
+@property (nonatomic, weak) IBOutlet VLCVoutView* videoView;
+@property (nonatomic, weak) IBOutlet VLCControlsBarCommon* controlsBar;
 @property (readonly) BOOL inFullscreenTransition;
 @property (readonly) BOOL darkInterface;
 @property (readonly) BOOL windowShouldExitFullscreenWhenFinished;
 @property (readwrite, assign) NSRect previousSavedFrame;
-@property (readwrite, assign) NSSize nativeVideoSize;
+@property (nonatomic, readwrite, assign) NSSize nativeVideoSize;
 
 - (void)setWindowLevel:(NSInteger)i_state;
 - (void)resizeWindow;

modules/gui/macosx/controls.m

@@ -46,8 +46,6 @@
  *****************************************************************************/
 @implementation VLCControls
 
-@synthesize jumpTimeValue;
-
 - (void)awakeFromNib
 {
     [o_specificTime_mi setTitle: _NS("Jump to Time")];

modules/gui/macosx/coredialogs.m

@@ -35,7 +35,6 @@
 @interface VLCCoreDialogProvider()
 {
     ErrorWindowController *o_error_panel;
-    BOOL b_progress_cancelled;
 }
 @end
 
@@ -43,8 +42,6 @@
 
 static VLCCoreDialogProvider *_o_sharedInstance = nil;
 
-@synthesize progressCancelled=b_progress_cancelled;
-
 + (VLCCoreDialogProvider *)sharedInstance
 {
     return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init];
@@ -54,7 +51,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
 {
     if (!_o_sharedInstance) {
         _o_sharedInstance = [super init];
-        b_progress_cancelled = NO;
+        _progressCancelled = NO;
     }
 
     return _o_sharedInstance;

modules/gui/macosx/eyetv.m

@@ -28,17 +28,8 @@
 /* for various VLC core related calls */
 #import "intf.h"
 
-@interface VLCEyeTVController()
-{
-    BOOL b_eyeTVactive;
-    BOOL b_deviceConnected;
-}
-@end
-
 @implementation VLCEyeTVController
 
-@synthesize eyeTVRunning = b_eyeTVactive, deviceConnected = b_deviceConnected;
-
 static VLCEyeTVController *_o_sharedInstance = nil;
 
 + (VLCEyeTVController *)sharedInstance
@@ -66,15 +57,15 @@ static VLCEyeTVController *_o_sharedInstance = nil;
 {
     /* update our info on the used device */
     if ([[theNotification name] isEqualToString: @"DeviceAdded"])
-        b_deviceConnected = YES;
+        _deviceConnected = YES;
     if ([[theNotification name] isEqualToString: @"DeviceRemoved"])
-        b_deviceConnected = NO;
+        _deviceConnected = NO;
 
     /* is eyetv running? */
     if ([[theNotification name] isEqualToString: @"PluginInit"])
-        b_eyeTVactive = YES;
+        _eyeTVRunning = YES;
     if ([[theNotification name] isEqualToString: @"PluginQuit"])
-        b_eyeTVactive = NO;
+        _eyeTVRunning = NO;
 }
 
 - (void)launchEyeTV

modules/gui/macosx/intf.m

@@ -513,7 +513,6 @@ audio_output_t *getAout(void)
     BOOL nib_coredialogs_loaded; /* CoreDialogs nibfile */
     BOOL nib_bookmarks_loaded;   /* Bookmarks nibfile */
     BOOL b_active_videoplayback;
-    BOOL b_nativeFullscreenMode;
 
     bool b_intf_terminating; /* Makes sure applicationWillTerminate will be called only once */
 
@@ -528,8 +527,6 @@ audio_output_t *getAout(void)
 
     NSArray *o_usedHotkeys;
 
-    VLCVoutWindowController *o_vout_controller;
-
     InputManager *o_input_manager;
 }
 
@@ -544,9 +541,6 @@ audio_output_t *getAout(void)
  *****************************************************************************/
 @implementation VLCMain
 
-@synthesize voutController=o_vout_controller;
-@synthesize nativeFullscreenMode=b_nativeFullscreenMode;
-
 #pragma mark -
 #pragma mark Initialization
 
@@ -580,7 +574,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     NSDictionary *appDefaults = [NSDictionary dictionaryWithObject:@"NO" forKey:@"LiveUpdateTheMessagesPanel"];
     [defaults registerDefaults:appDefaults];
 
-    o_vout_controller = [[VLCVoutWindowController alloc] init];
+    _voutController = [[VLCVoutWindowController alloc] init];
 
     return _o_sharedMainInstance;
 }
@@ -650,10 +644,10 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_remote setDelegate: _o_sharedMainInstance];
 
     /* yeah, we are done */
-    b_nativeFullscreenMode = NO;
+    _nativeFullscreenMode = NO;
 #ifdef MAC_OS_X_VERSION_10_7
     if (!OSX_SNOW_LEOPARD)
-        b_nativeFullscreenMode = var_InheritBool(p_intf, "macosx-nativefullscreenmode");
+        _nativeFullscreenMode = var_InheritBool(p_intf, "macosx-nativefullscreenmode");
 #endif
 
     if (config_GetInt(VLCIntf, "macosx-icon-change")) {
@@ -798,7 +792,7 @@ static VLCMain *_o_sharedMainInstance = nil;
 
     [o_vout_provider_lock lock];
     // closes all open vouts
-    o_vout_controller = nil;
+    _voutController = nil;
     [o_vout_provider_lock unlock];
 
     /* unsubscribe from libvlc's debug messages */
@@ -1224,18 +1218,20 @@ static VLCMain *_o_sharedMainInstance = nil;
 
     bool loop = var_GetBool(p_playlist, "loop");
     bool repeat = var_GetBool(p_playlist, "repeat");
+
+    VLCMainWindowControlsBar *controlsBar = (VLCMainWindowControlsBar *)[o_mainwindow controlsBar];
     if (repeat) {
-        [[o_mainwindow controlsBar] setRepeatOne];
+        [controlsBar setRepeatOne];
         [o_mainmenu setRepeatOne];
     } else if (loop) {
-        [[o_mainwindow controlsBar] setRepeatAll];
+        [controlsBar setRepeatAll];
         [o_mainmenu setRepeatAll];
     } else {
-        [[o_mainwindow controlsBar] setRepeatOff];
+        [controlsBar setRepeatOff];
         [o_mainmenu setRepeatOff];
     }
 
-    [[o_mainwindow controlsBar] setShuffle];
+    [controlsBar setShuffle];
     [o_mainmenu setShuffle];
 }
 

modules/gui/macosx/misc.m

@@ -317,16 +317,11 @@ static bool b_old_spaces_style = YES;
 @interface VLCDragDropView()
 {
     bool b_activeDragAndDrop;
-
-    __unsafe_unretained id _dropHandler;
 }
 @end
 
 @implementation VLCDragDropView
 
-@synthesize dropHandler=_dropHandler;
-@synthesize drawBorder;
-
 - (id)initWithFrame:(NSRect)frame
 {
     self = [super initWithFrame:frame];
@@ -592,16 +587,8 @@ void _drawFrameInRect(NSRect frameRect)
  * VLCVolumeSliderCommon
  *****************************************************************************/
 
-@interface VLCVolumeSliderCommon()
-{
-    BOOL _usesBrightArtwork;
-}
-@end
-
 @implementation VLCVolumeSliderCommon : NSSlider
 
-@synthesize usesBrightArtwork = _usesBrightArtwork;
-
 - (void)scrollWheel:(NSEvent *)o_event
 {
     BOOL b_up = NO;

modules/gui/macosx/open.m

@@ -94,8 +94,6 @@ struct display_info_t
 
 @implementation VLCOpen
 
-@synthesize fileSubDelay, fileSubFps;
-
 #pragma mark -
 #pragma mark Init
 

modules/gui/macosx/output.h

@@ -79,9 +79,7 @@
     IBOutlet id o_http_chkbox;
     IBOutlet id o_file_chkbox;
 }
-@property (readwrite, retain) NSArray * soutMRL;
-
-- (void)setTranscode:(NSString *)o_transcode_string;
+@property (readwrite, retain) NSArray *soutMRL;
 
 - (void)initStrings;
 

modules/gui/macosx/output.m

@@ -40,18 +40,16 @@
 
 @interface VLCOutput()
 {
-    NSArray *o_mrl;
     NSString *o_transcode;
 }
 @end
 
 @implementation VLCOutput
-@synthesize soutMRL=o_mrl;
 
 - (id)init
 {
     self = [super init];
-    o_mrl = [[NSArray alloc] init];
+    _soutMRL = [[NSArray alloc] init];
     o_transcode = [[NSString alloc] init];
     return self;
 }

modules/gui/macosx/playlistinfo.m

@@ -429,8 +429,6 @@ error:
 
 @interface VLCInfoTreeItem ()
 {
-    NSString *_name;
-    NSString *_value;
     int i_object_id;
     input_item_t * p_item;
     VLCInfoTreeItem *_parent;
@@ -442,8 +440,6 @@ error:
 
 @implementation VLCInfoTreeItem
 
-@synthesize name = _name, value = _value;
-
 - (id)initWithName:(NSString *)item_name
              value:(NSString *)item_value
                 ID:(int)i_id

modules/gui/macosx/prefs_widgets.m

@@ -388,13 +388,10 @@ o_textfield = [[NSSecureTextField alloc] initWithFrame: s_rc];              \
 @interface VLCConfigControl()
 {
     char            *psz_name;
-    int             i_type;
-    bool      b_advanced;
 }
 @end
 
 @implementation VLCConfigControl
-@synthesize type = i_type, advanced = b_advanced;
 
 - (id)initWithFrame:(NSRect)frame
 {
@@ -410,8 +407,8 @@ o_textfield = [[NSSecureTextField alloc] initWithFrame: s_rc];              \
     if (self != nil) {
         _p_item = p_item;
         psz_name = p_item->psz_name;
-        i_type = p_item->i_type;
-        b_advanced = p_item->b_advanced;
+        _type = p_item->i_type;
+        _advanced = p_item->b_advanced;
         [self setAutoresizingMask:NSViewWidthSizable | NSViewMinYMargin ];
     }
     return (self);