From: Felix Paul Kühne Date: Sun, 12 Apr 2009 19:27:32 +0000 (+0200) Subject: macosx: get rid of the infamous 'get' prefixes everywhere and finally respect Cocoa... X-Git-Tag: 1.0.0-pre2~87 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c3a1a712783d3818557ac17de685fa7a0300a0dc;p=vlc macosx: get rid of the infamous 'get' prefixes everywhere and finally respect Cocoa's naming scheme here --- diff --git a/modules/gui/macosx/applescript.m b/modules/gui/macosx/applescript.m index 0f4a879412..4935d3f71d 100644 --- a/modules/gui/macosx/applescript.m +++ b/modules/gui/macosx/applescript.m @@ -96,7 +96,7 @@ return nil; } - VLCControls * o_controls = (VLCControls *)[[NSApp delegate] getControls]; + VLCControls * o_controls = (VLCControls *)[[NSApp delegate] controls]; if ( o_controls ) { @@ -145,12 +145,12 @@ @implementation NSApplication(ScriptSupport) - (BOOL) scriptFullscreenMode { - VLCControls * o_controls = (VLCControls *)[[self delegate] getControls]; + VLCControls * o_controls = (VLCControls *)[[self delegate] controls]; return [o_controls isFullscreen]; } - (void) setScriptFullscreenMode: (BOOL) mode { - VLCControls * o_controls = (VLCControls *)[[self delegate] getControls]; + VLCControls * o_controls = (VLCControls *)[[self delegate] controls]; if (mode == [o_controls isFullscreen]) return; [o_controls toogleFullscreen: self]; } diff --git a/modules/gui/macosx/bookmarks.h b/modules/gui/macosx/bookmarks.h index 1f9e2beecd..7388ef93f4 100644 --- a/modules/gui/macosx/bookmarks.h +++ b/modules/gui/macosx/bookmarks.h @@ -64,5 +64,5 @@ - (void)initStrings; - (void)showBookmarks; -- (id)getDataTable; +- (id)dataTable; @end diff --git a/modules/gui/macosx/bookmarks.m b/modules/gui/macosx/bookmarks.m index 580c815882..554fe8f92b 100644 --- a/modules/gui/macosx/bookmarks.m +++ b/modules/gui/macosx/bookmarks.m @@ -318,7 +318,7 @@ clear: msg_Dbg( VLCIntf, "calling wizard"); char *psz_uri = input_item_GetURI( input_GetItem( p_input ) ); - [[[VLCMain sharedInstance] getWizard] initWithExtractValuesFrom: + [[[VLCMain sharedInstance] wizard] initWithExtractValuesFrom: [[NSNumber numberWithInt: (pp_bookmarks[i_first]->i_time_offset/1000000)] stringValue] to: [[NSNumber numberWithInt: @@ -366,7 +366,7 @@ clear: * callback stuff *****************************************************************************/ --(id)getDataTable +-(id)dataTable { return o_tbl_dataTable; } diff --git a/modules/gui/macosx/controls.h b/modules/gui/macosx/controls.h index 0522a1bea5..bd123bde20 100644 --- a/modules/gui/macosx/controls.h +++ b/modules/gui/macosx/controls.h @@ -110,7 +110,7 @@ - (IBAction)goToSpecificTime:(id)sender; -- (id)getFSPanel; +- (id)fspanel; @end diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m index 98cf405125..561e09dd6d 100644 --- a/modules/gui/macosx/controls.m +++ b/modules/gui/macosx/controls.m @@ -162,14 +162,14 @@ { id window; id voutView = nil; - id embeddedViewList = [[VLCMain sharedInstance] getEmbeddedList]; + id embeddedViewList = [[VLCMain sharedInstance] embeddedList]; NSEnumerator *enumerator = [[NSApp orderedWindows] objectEnumerator]; while( !voutView && ( window = [enumerator nextObject] ) ) { /* We have an embedded vout */ if( [embeddedViewList windowContainsEmbedded: window] ) { - voutView = [embeddedViewList getViewForWindow: window]; + voutView = [embeddedViewList viewForWindow: window]; } /* We have a detached vout */ else if( [[window className] isEqualToString: @"VLCVoutWindow"] ) @@ -485,7 +485,7 @@ [o_vout_view toggleFloatOnTop]; else if( [o_title isEqualToString: _NS("Fit to Screen") ] ) { - id o_window = [o_vout_view getWindow]; + id o_window = [o_vout_view voutWindow]; if( ![o_window isZoomed] ) [o_window performZoom:self]; } @@ -960,7 +960,7 @@ } } -- (id)getFSPanel +- (id)fspanel { if( o_fs_panel ) return o_fs_panel; @@ -1074,7 +1074,7 @@ while( (o_window = [o_enumerator nextObject])) { if( [[o_window className] isEqualToString: @"VLCVoutWindow"] || - [[[VLCMain sharedInstance] getEmbeddedList] + [[[VLCMain sharedInstance] embeddedList] windowContainsEmbedded: o_window]) { bEnabled = TRUE; @@ -1179,7 +1179,7 @@ - (void)mouseDown: (NSEvent *)ourEvent { if( [ourEvent clickCount] > 1 ) - [[[VLCMain sharedInstance] getControls] goToSpecificTime: nil]; + [[[VLCMain sharedInstance] controls] goToSpecificTime: nil]; else [[VLCMain sharedInstance] timeFieldWasClicked: self]; } diff --git a/modules/gui/macosx/coredialogs.h b/modules/gui/macosx/coredialogs.h index ceb25c73c9..5beb045e08 100644 --- a/modules/gui/macosx/coredialogs.h +++ b/modules/gui/macosx/coredialogs.h @@ -87,6 +87,6 @@ -(void)showProgressDialog: (NSValue *)o_value; -(IBAction)progDialogAction:(id)sender; --(id)getErrorPanel; +-(id)errorPanel; @end \ No newline at end of file diff --git a/modules/gui/macosx/coredialogs.m b/modules/gui/macosx/coredialogs.m index 8ed476de35..925c9949d2 100644 --- a/modules/gui/macosx/coredialogs.m +++ b/modules/gui/macosx/coredialogs.m @@ -237,13 +237,13 @@ void updateProgressPanel (void *priv, const char *text, float value) NSString *o_txt; if( text != NULL ) o_txt = [NSString stringWithUTF8String: text]; - [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCCoreDialogProgressBarUpdateNotification" object:[[VLCMain sharedInstance] getCoreDialogProvider] userInfo:[NSDictionary dictionaryWithObjectsAndKeys: o_txt, @"Text", [NSNumber numberWithInt: ((int)(value * 1000.))], @"IntValue", nil]]; + [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCCoreDialogProgressBarUpdateNotification" object:[[VLCMain sharedInstance] coreDialogProvider] userInfo:[NSDictionary dictionaryWithObjectsAndKeys: o_txt, @"Text", [NSNumber numberWithInt: ((int)(value * 1000.))], @"IntValue", nil]]; } void destroyProgressPanel (void *priv) { NSLog( @"we should destroy" ); - [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCCoreDialogProgressBarDestroyNotification" object:[[VLCMain sharedInstance] getCoreDialogProvider] userInfo: nil]; + [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCCoreDialogProgressBarDestroyNotification" object:[[VLCMain sharedInstance] coreDialogProvider] userInfo: nil]; } bool checkProgressPanel (void *priv) @@ -258,7 +258,7 @@ bool checkProgressPanel (void *priv) b_progress_cancelled = YES; } --(id)getErrorPanel +-(id)errorPanel { return o_error_panel; } diff --git a/modules/gui/macosx/embeddedwindow.m b/modules/gui/macosx/embeddedwindow.m index 0dc8bd28c8..2ffaa3ba02 100644 --- a/modules/gui/macosx/embeddedwindow.m +++ b/modules/gui/macosx/embeddedwindow.m @@ -379,18 +379,18 @@ - (void)hasBecomeFullscreen { - [o_fullscreen_window makeFirstResponder: [[[VLCMain sharedInstance] getControls] voutView]]; + [o_fullscreen_window makeFirstResponder: [[[VLCMain sharedInstance] controls] voutView]]; [o_fullscreen_window makeKeyWindow]; [o_fullscreen_window setAcceptsMouseMovedEvents: TRUE]; /* tell the fspanel to move itself to front next time it's triggered */ - [[[[VLCMain sharedInstance] getControls] getFSPanel] setVoutWasUpdated: (int)[[o_fullscreen_window screen] displayID]]; + [[[[VLCMain sharedInstance] controls] fspanel] setVoutWasUpdated: (int)[[o_fullscreen_window screen] displayID]]; if([self isVisible]) [super orderOut: self]; - [[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil]; + [[[[VLCMain sharedInstance] controls] fspanel] setActive: nil]; b_fullscreen = YES; [self unlockFullscreenAnimation]; @@ -430,7 +430,7 @@ CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token); CGDisplayFade( token, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES ); - [[[[VLCMain sharedInstance] getControls] getFSPanel] setNonActive: nil]; + [[[[VLCMain sharedInstance] controls] fspanel] setNonActive: nil]; SetSystemUIMode( kUIModeNormal, kUIOptionAutoShowMenuBar); /* Will release the lock */ @@ -448,7 +448,7 @@ [self setAlphaValue: 0.0]; [self orderFront: self]; - [[[[VLCMain sharedInstance] getControls] getFSPanel] setNonActive: nil]; + [[[[VLCMain sharedInstance] controls] fspanel] setNonActive: nil]; SetSystemUIMode( kUIModeNormal, kUIOptionAutoShowMenuBar); if (o_fullscreen_anim1) diff --git a/modules/gui/macosx/equalizer.h b/modules/gui/macosx/equalizer.h index 509a757884..e736be44f4 100644 --- a/modules/gui/macosx/equalizer.h +++ b/modules/gui/macosx/equalizer.h @@ -56,7 +56,7 @@ - (void)awakeFromNib; - (void)setValue: (float)value forSlider: (int)index; -- (id)getSliderByIndex: (int)index; +- (id)sliderByIndex: (int)index; - (void)setBandSlidersValues: (float *)values; - (void)initBandSliders; diff --git a/modules/gui/macosx/equalizer.m b/modules/gui/macosx/equalizer.m index b198f7d637..38c15bfe49 100644 --- a/modules/gui/macosx/equalizer.m +++ b/modules/gui/macosx/equalizer.m @@ -457,7 +457,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf, } -- (id)getSliderByIndex:(int)index +- (id)sliderByIndex:(int)index { switch(index) { @@ -495,7 +495,7 @@ static bool GetFiltersStatus( intf_thread_t *p_intf, - (void)setValue:(float)value forSlider:(int)index { - id slider = [self getSliderByIndex:index]; + id slider = [self sliderByIndex:index]; if (slider != nil) { diff --git a/modules/gui/macosx/extended.h b/modules/gui/macosx/extended.h index 4524d3ba87..ca38b23476 100644 --- a/modules/gui/macosx/extended.h +++ b/modules/gui/macosx/extended.h @@ -95,7 +95,7 @@ - (IBAction)moreInfoVideoFilters:(id)sender; + (VLCExtended *)sharedInstance; -- (BOOL)getConfigChanged; +- (BOOL)configChanged; - (void)showPanel; - (void)initStrings; diff --git a/modules/gui/macosx/extended.m b/modules/gui/macosx/extended.m index 9663f4f45d..7b182e8812 100644 --- a/modules/gui/macosx/extended.m +++ b/modules/gui/macosx/extended.m @@ -180,7 +180,7 @@ static VLCExtended *_o_sharedInstance = nil; [self initStrings]; } -- (BOOL)getConfigChanged +- (BOOL)configChanged { return o_config_changed; } @@ -416,13 +416,13 @@ static VLCExtended *_o_sharedInstance = nil; if( p_vout != NULL ) { - p_real_vout = [VLCVoutView getRealVout: p_vout]; + p_real_vout = [VLCVoutView realVout: p_vout]; var_Set( p_real_vout, "macosx-opaqueness", val ); while ((o_window = [o_enumerator nextObject])) { if( [[o_window className] isEqualToString: @"VLCVoutWindow"] || - [[[VLCMain sharedInstance] getEmbeddedList] + [[[VLCMain sharedInstance] embeddedList] windowContainsEmbedded: o_window]) { [o_window setAlphaValue: val.f_float]; diff --git a/modules/gui/macosx/fspanel.m b/modules/gui/macosx/fspanel.m index 5b997bee44..7b31e6ec34 100644 --- a/modules/gui/macosx/fspanel.m +++ b/modules/gui/macosx/fspanel.m @@ -178,9 +178,9 @@ - (void)setActive:(id)noData { - if( [[[VLCMain sharedInstance] getControls] voutView] != nil ) + if( [[[VLCMain sharedInstance] controls] voutView] != nil ) { - if( [[[[VLCMain sharedInstance] getControls] voutView] isFullscreen] ) + if( [[[[VLCMain sharedInstance] controls] voutView] isFullscreen] ) { b_nonActive = NO; [self fadeIn]; @@ -247,8 +247,8 @@ - (void)mouseExited:(NSEvent *)theEvent { /* give up our focus, so the vout may show us again without letting the user clicking it */ - if( [[[[VLCMain sharedInstance] getControls] voutView] isFullscreen] ) - [[[[[VLCMain sharedInstance] getControls] voutView] window] makeKeyWindow]; + if( [[[[VLCMain sharedInstance] controls] voutView] isFullscreen] ) + [[[[[VLCMain sharedInstance] controls] voutView] window] makeKeyWindow]; } - (void)hideMouse @@ -524,32 +524,32 @@ - (IBAction)play:(id)sender { - [[[VLCMain sharedInstance] getControls] play: sender]; + [[[VLCMain sharedInstance] controls] play: sender]; } - (IBAction)forward:(id)sender { - [[[VLCMain sharedInstance] getControls] forward: sender]; + [[[VLCMain sharedInstance] controls] forward: sender]; } - (IBAction)backward:(id)sender { - [[[VLCMain sharedInstance] getControls] backward: sender]; + [[[VLCMain sharedInstance] controls] backward: sender]; } - (IBAction)prev:(id)sender { - [[[VLCMain sharedInstance] getControls] prev: sender]; + [[[VLCMain sharedInstance] controls] prev: sender]; } - (IBAction)next:(id)sender { - [[[VLCMain sharedInstance] getControls] next: sender]; + [[[VLCMain sharedInstance] controls] next: sender]; } - (IBAction)windowAction:(id)sender { - [[[VLCMain sharedInstance] getControls] windowAction: sender]; + [[[VLCMain sharedInstance] controls] windowAction: sender]; } - (IBAction)fsTimeSliderUpdate:(id)sender @@ -559,7 +559,7 @@ - (IBAction)fsVolumeSliderUpdate:(id)sender { - [[[VLCMain sharedInstance] getControls] volumeSliderUpdated: sender]; + [[[VLCMain sharedInstance] controls] volumeSliderUpdated: sender]; } #define addImage(image, _x, _y, mode, _width) \ diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h index 77e2b80f20..6f85f51600 100644 --- a/modules/gui/macosx/intf.h +++ b/modules/gui/macosx/intf.h @@ -42,7 +42,7 @@ *****************************************************************************/ unsigned int CocoaKeyToVLC( unichar i_key ); -#define VLCIntf [[VLCMain sharedInstance] getIntf] +#define VLCIntf [[VLCMain sharedInstance] intf] #define _NS(s) [[VLCMain sharedInstance] localizedString: _(s)] /* Get an alternate version of the string. @@ -341,25 +341,25 @@ static void MsgCallback( msg_cb_data_t *, msg_item_t *, unsigned ); + (VLCMain *)sharedInstance; -- (intf_thread_t *)getIntf; +- (intf_thread_t *)intf; - (void)setIntf:(intf_thread_t *)p_mainintf; - (void)controlTintChanged; -- (id)getControls; -- (id)getSimplePreferences; -- (id)getPreferences; -- (id)getPlaylist; +- (id)controls; +- (id)simplePreferences; +- (id)preferences; +- (id)playlist; - (BOOL)isPlaylistCollapsed; -- (id)getInfo; -- (id)getWizard; -- (id)getBookmarks; -- (id)getEmbeddedList; -- (id)getCoreDialogProvider; -- (id)getMainIntfPgbar; -- (id)getControllerWindow; -- (id)getVoutMenu; -- (id)getEyeTVController; +- (id)info; +- (id)wizard; +- (id)bookmarks; +- (id)embeddedList; +- (id)coreDialogProvider; +- (id)mainIntfPgbar; +- (id)controllerWindow; +- (id)voutMenu; +- (id)eyeTVController; - (void)applicationWillTerminate:(NSNotification *)notification; - (NSString *)localizedString:(const char *)psz; - (char *)delocalizeString:(NSString *)psz; diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index a6469f7816..e1fc00eb91 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -234,7 +234,7 @@ static int DialogCallback( vlc_object_t *p_this, const char *type, vlc_value_t p const dialog_fatal_t *p_dialog = (const dialog_fatal_t *)value.p_address; NSValue *o_value = [NSValue valueWithPointer:p_dialog]; - [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCNewCoreDialogEventNotification" object:[interface getCoreDialogProvider] userInfo:[NSDictionary dictionaryWithObjectsAndKeys: o_value, @"VLCDialogPointer", [NSString stringWithUTF8String: type], @"VLCDialogType", nil]]; + [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCNewCoreDialogEventNotification" object:[interface coreDialogProvider] userInfo:[NSDictionary dictionaryWithObjectsAndKeys: o_value, @"VLCDialogPointer", [NSString stringWithUTF8String: type], @"VLCDialogType", nil]]; [o_pool release]; return VLC_SUCCESS; @@ -314,7 +314,7 @@ static VLCMain *_o_sharedMainInstance = nil; p_intf = p_mainintf; } -- (intf_thread_t *)getIntf { +- (intf_thread_t *)intf { return p_intf; } @@ -745,7 +745,7 @@ static VLCMain *_o_sharedMainInstance = nil; config_PutInt( p_intf->p_libvlc, "volume", i_lastShownVolume ); /* save the prefs if they were changed in the extended panel */ - if(o_extended && [o_extended getConfigChanged]) + if(o_extended && [o_extended configChanged]) { [o_extended savePrefs]; } @@ -1315,9 +1315,8 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key ) #pragma mark - #pragma mark Other objects getters -// FIXME: this is ugly and does not respect cocoa naming scheme -- (id)getControls +- (id)controls { if( o_controls ) return o_controls; @@ -1325,7 +1324,7 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key ) return nil; } -- (id)getSimplePreferences +- (id)simplePreferences { if( !o_sprefs ) return nil; @@ -1336,7 +1335,7 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key ) return o_sprefs; } -- (id)getPreferences +- (id)preferences { if( !o_prefs ) return nil; @@ -1347,7 +1346,7 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key ) return o_prefs; } -- (id)getPlaylist +- (id)playlist { if( o_playlist ) return o_playlist; @@ -1360,7 +1359,7 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key ) return ![o_btn_playlist state]; } -- (id)getInfo +- (id)info { if( o_info ) return o_info; @@ -1368,7 +1367,7 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key ) return nil; } -- (id)getWizard +- (id)wizard { if( o_wizard ) return o_wizard; @@ -1376,12 +1375,12 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key ) return nil; } -- (id)getVLM +- (id)vlm { return o_vlm; } -- (id)getBookmarks +- (id)bookmarks { if( o_bookmarks ) return o_bookmarks; @@ -1389,7 +1388,7 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key ) return nil; } -- (id)getEmbeddedList +- (id)embeddedList { if( o_embedded_list ) return o_embedded_list; @@ -1397,7 +1396,7 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key ) return nil; } -- (id)getCoreDialogProvider +- (id)coreDialogProvider { if( o_coredialogs ) return o_coredialogs; @@ -1405,7 +1404,7 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key ) return nil; } -- (id)getMainIntfPgbar +- (id)mainIntfPgbar { if( o_main_pgbar ) return o_main_pgbar; @@ -1413,19 +1412,19 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key ) return nil; } -- (id)getControllerWindow +- (id)controllerWindow { if( o_window ) return o_window; return nil; } -- (id)getVoutMenu +- (id)voutMenu { return o_vout_menu; } -- (id)getEyeTVController +- (id)eyeTVController { if( o_eyetv ) return o_eyetv; @@ -1596,7 +1595,7 @@ static void manage_cleanup( void * args ) if( [self isPlaylistCollapsed] == YES ) { PL_LOCK; - [[self getInfo] updatePanelWithItem: playlist_CurrentPlayingItem( p_playlist )->p_input]; + [[self info] updatePanelWithItem: playlist_CurrentPlayingItem( p_playlist )->p_input]; PL_UNLOCK; } @@ -1633,8 +1632,8 @@ static void manage_cleanup( void * args ) [o_timeslider setFloatValue: 0.0]; [o_timeslider setEnabled: b_seekable]; [o_timefield setStringValue: @"00:00"]; - [[[self getControls] getFSPanel] setStreamPos: 0 andTime: @"00:00"]; - [[[self getControls] getFSPanel] setSeekable: b_seekable]; + [[[self controls] fspanel] setStreamPos: 0 andTime: @"00:00"]; + [[[self controls] fspanel] setSeekable: b_seekable]; [o_embedded_window setSeekable: b_seekable]; @@ -1662,7 +1661,7 @@ static void manage_cleanup( void * args ) if( p_intf->p_sys->b_intf_show ) { if( [[o_controls voutView] isFullscreen] && config_GetInt( VLCIntf, "macosx-fspanel" ) ) - [[o_controls getFSPanel] fadeIn]; + [[o_controls fspanel] fadeIn]; else [o_window makeKeyAndOrderFront: self]; @@ -1688,7 +1687,7 @@ static void manage_cleanup( void * args ) free(name); [self setScrollField: aString stopAfter:-1]; - [[[self getControls] getFSPanel] setStreamTitle: aString]; + [[[self controls] fspanel] setStreamTitle: aString]; [[o_controls voutView] updateTitle]; @@ -1720,7 +1719,7 @@ static void manage_cleanup( void * args ) o_time = [NSString stringWithUTF8String: secstotimestr( psz_time, (time.i_time / 1000000) )]; [o_timefield setStringValue: o_time]; - [[[self getControls] getFSPanel] setStreamPos: f_updated andTime: o_time]; + [[[self controls] fspanel] setStreamPos: f_updated andTime: o_time]; [o_embedded_window setTime: o_time position: f_updated]; } @@ -1756,7 +1755,7 @@ static void manage_cleanup( void * args ) i_volume_step = config_GetInt( p_intf->p_libvlc, "volume-step" ); [o_volumeslider setFloatValue: (float)i_lastShownVolume / i_volume_step]; [o_volumeslider setEnabled: TRUE]; - [[[self getControls] getFSPanel] setVolumeLevel: (float)i_lastShownVolume / i_volume_step]; + [[[self controls] fspanel] setVolumeLevel: (float)i_lastShownVolume / i_volume_step]; p_intf->p_sys->b_mute = ( i_lastShownVolume == 0 ); p_intf->p_sys->b_volume_update = FALSE; } @@ -1912,7 +1911,7 @@ end: o_temp = [NSString stringWithUTF8String:p_item->p_input->psz_name]; PL_UNLOCK; [self setScrollField: o_temp stopAfter:-1]; - [[[self getControls] getFSPanel] setStreamTitle: o_temp]; + [[[self controls] fspanel] setStreamTitle: o_temp]; vlc_object_release( p_input ); pl_Release( p_intf ); return; @@ -1925,7 +1924,7 @@ end: { if( i_status == PLAYING_S ) { - [[[self getControls] getFSPanel] setPause]; + [[[self controls] fspanel] setPause]; [o_btn_play setImage: o_img_pause]; [o_btn_play setAlternateImage: o_img_pause_pressed]; [o_btn_play setToolTip: _NS("Pause")]; @@ -1935,7 +1934,7 @@ end: } else { - [[[self getControls] getFSPanel] setPlay]; + [[[self controls] fspanel] setPlay]; [o_btn_play setImage: o_img_play]; [o_btn_play setAlternateImage: o_img_play_pressed]; [o_btn_play setToolTip: _NS("Play")]; @@ -2005,7 +2004,7 @@ end: o_time = [NSString stringWithUTF8String: secstotimestr( psz_time, (time.i_time / 1000000) )]; [o_timefield setStringValue: o_time]; - [[[self getControls] getFSPanel] setStreamPos: f_updated andTime: o_time]; + [[[self controls] fspanel] setStreamPos: f_updated andTime: o_time]; [o_embedded_window setTime: o_time position: f_updated]; vlc_object_release( p_input ); } @@ -2437,7 +2436,7 @@ end: - (IBAction)viewErrorsAndWarnings:(id)sender { - [[[self getCoreDialogProvider] getErrorPanel] showPanel]; + [[[self coreDialogProvider] errorPanel] showPanel]; } - (IBAction)showMessagesPanel:(id)sender @@ -2633,7 +2632,7 @@ end: else [o_btn_playlist setState: YES]; - [[self getPlaylist] outlineViewSelectionDidChange: NULL]; + [[self playlist] outlineViewSelectionDidChange: NULL]; } - (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)proposedFrameSize diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m index b2b3dbdca5..ee673f65d0 100644 --- a/modules/gui/macosx/misc.m +++ b/modules/gui/macosx/misc.m @@ -433,7 +433,7 @@ static NSMutableArray *blackoutWindows = NULL; return TRUE; return [[VLCMain sharedInstance] hasDefinedShortcutKey:o_event] || - [(VLCControls *)[[VLCMain sharedInstance] getControls] keyEvent:o_event]; + [(VLCControls *)[[VLCMain sharedInstance] controls] keyEvent:o_event]; } @end @@ -498,7 +498,7 @@ static NSMutableArray *blackoutWindows = NULL; o_dic = [NSDictionary dictionaryWithObject:[o_values objectAtIndex:i] forKey:@"ITEM_URL"]; o_array = [o_array arrayByAddingObject: o_dic]; } - [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist] appendArray: o_array atPos: -1 enqueue:NO]; + [(VLCPlaylist *)[[VLCMain sharedInstance] playlist] appendArray: o_array atPos: -1 enqueue:NO]; return YES; } } @@ -578,9 +578,9 @@ static NSMutableArray *blackoutWindows = NULL; o_array = [o_array arrayByAddingObject: o_dic]; } if( b_autoplay ) - [[[VLCMain sharedInstance] getPlaylist] appendArray: o_array atPos: -1 enqueue:NO]; + [[[VLCMain sharedInstance] playlist] appendArray: o_array atPos: -1 enqueue:NO]; else - [[[VLCMain sharedInstance] getPlaylist] appendArray: o_array atPos: -1 enqueue:YES]; + [[[VLCMain sharedInstance] playlist] appendArray: o_array atPos: -1 enqueue:YES]; return YES; } } diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m index d0f99f045e..13ca6c0ce1 100644 --- a/modules/gui/macosx/open.m +++ b/modules/gui/macosx/open.m @@ -400,10 +400,10 @@ static VLCOpen *_o_sharedMainInstance = nil; } if( [o_output_ckbox state] == NSOnState ) { - for (i = 0 ; i < [[o_sout_options getMRL] count] ; i++) + for (i = 0 ; i < [[o_sout_options mrl] count] ; i++) { [o_options addObject: [NSString stringWithString: - [[(VLCOutput *)o_sout_options getMRL] objectAtIndex: i]]]; + [[(VLCOutput *)o_sout_options mrl] objectAtIndex: i]]]; } } if( [[[o_tabview selectedTabViewItem] label] isEqualToString: _NS("Capture")] ) @@ -961,9 +961,9 @@ static VLCOpen *_o_sharedMainInstance = nil; { if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: @"EyeTV"] ) { - if( [[[VLCMain sharedInstance] getEyeTVController] isEyeTVrunning] == YES ) + if( [[[VLCMain sharedInstance] eyeTVController] isEyeTVrunning] == YES ) { - if( [[[VLCMain sharedInstance] getEyeTVController] isDeviceConnected] == YES ) + if( [[[VLCMain sharedInstance] eyeTVController] isDeviceConnected] == YES ) { [self showCaptureView: o_eyetv_running_view]; [self setupChannelInfo]; @@ -1019,20 +1019,20 @@ static VLCOpen *_o_sharedMainInstance = nil; { if( sender == o_eyetv_nextProgram_btn ) { - int chanNum = [[[VLCMain sharedInstance] getEyeTVController] switchChannelUp: YES]; + int chanNum = [[[VLCMain sharedInstance] eyeTVController] switchChannelUp: YES]; [o_eyetv_channels_pop selectItemWithTag:chanNum]; [o_mrl setStringValue: [NSString stringWithFormat:@"eyetv:// :eyetv-channel=%d", chanNum]]; } else if( sender == o_eyetv_previousProgram_btn ) { - int chanNum = [[[VLCMain sharedInstance] getEyeTVController] switchChannelUp: NO]; + int chanNum = [[[VLCMain sharedInstance] eyeTVController] switchChannelUp: NO]; [o_eyetv_channels_pop selectItemWithTag:chanNum]; [o_mrl setStringValue: [NSString stringWithFormat:@"eyetv:// :eyetv-channel=%d", chanNum]]; } else if( sender == o_eyetv_channels_pop ) { int chanNum = [[sender selectedItem] tag]; - [[[VLCMain sharedInstance] getEyeTVController] selectChannel:chanNum]; + [[[VLCMain sharedInstance] eyeTVController] selectChannel:chanNum]; [o_mrl setStringValue: [NSString stringWithFormat:@"eyetv:// :eyetv-channel=%d", chanNum]]; } else @@ -1041,7 +1041,7 @@ static VLCOpen *_o_sharedMainInstance = nil; - (IBAction)eyetvLaunch:(id)sender { - [[[VLCMain sharedInstance] getEyeTVController] launchEyeTV]; + [[[VLCMain sharedInstance] eyeTVController] launchEyeTV]; } - (IBAction)eyetvGetPlugin:(id)sender @@ -1091,7 +1091,7 @@ static VLCOpen *_o_sharedMainInstance = nil; [o_eyetv_chn_status_txt setHidden: NO]; /* retrieve info */ - NSEnumerator *channels = [[[VLCMain sharedInstance] getEyeTVController] allChannels]; + NSEnumerator *channels = [[[VLCMain sharedInstance] eyeTVController] allChannels]; int x = -2; [[[o_eyetv_channels_pop menu] addItemWithTitle: _NS("Composite input") action: nil @@ -1112,7 +1112,7 @@ static VLCOpen *_o_sharedMainInstance = nil; keyEquivalent: @""] setTag:++x]; } /* make Tuner the default */ - [o_eyetv_channels_pop selectItemWithTag:[[[VLCMain sharedInstance] getEyeTVController] currentChannel]]; + [o_eyetv_channels_pop selectItemWithTag:[[[VLCMain sharedInstance] eyeTVController] currentChannel]]; } /* clean up GUI */ diff --git a/modules/gui/macosx/output.h b/modules/gui/macosx/output.h index b6ba3eb914..56aca1539c 100644 --- a/modules/gui/macosx/output.h +++ b/modules/gui/macosx/output.h @@ -84,7 +84,7 @@ } - (void)setMRL:(NSArray *)o_mrl_string; -- (NSArray *)getMRL; +- (NSArray *)mrl; - (void)setTranscode:(NSString *)o_transcode_string; - (void)initStrings; diff --git a/modules/gui/macosx/output.m b/modules/gui/macosx/output.m index e7f3133d03..14ff97b768 100644 --- a/modules/gui/macosx/output.m +++ b/modules/gui/macosx/output.m @@ -59,7 +59,7 @@ o_mrl = [o_mrl_array copy]; } -- (NSArray *)getMRL +- (NSArray *)mrl { return [o_mrl copy]; } diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index 20988a5808..6712df14ac 100644 --- a/modules/gui/macosx/playlist.m +++ b/modules/gui/macosx/playlist.m @@ -82,7 +82,7 @@ case NSEnterCharacter: case NSCarriageReturnCharacter: - [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist] playItem:self]; + [(VLCPlaylist *)[[VLCMain sharedInstance] playlist] playItem:self]; break; default: @@ -478,8 +478,8 @@ // TODO Find a way to keep the dict size to a minimum //[o_outline_dict removeAllObjects]; [o_outline_view reloadData]; - [[[[VLCMain sharedInstance] getWizard] getPlaylistWizard] reloadOutlineView]; - [[[[VLCMain sharedInstance] getBookmarks] getDataTable] reloadData]; + [[[[VLCMain sharedInstance] wizard] playlistWizard] reloadOutlineView]; + [[[[VLCMain sharedInstance] bookmarks] dataTable] reloadData]; playlist_t *p_playlist = pl_Hold( VLCIntf ); @@ -510,13 +510,13 @@ bool loop = var_GetBool( p_playlist, "loop" ); bool repeat = var_GetBool( p_playlist, "repeat" ); if( repeat ) - [[[VLCMain sharedInstance] getControls] repeatOne]; + [[[VLCMain sharedInstance] controls] repeatOne]; else if( loop ) - [[[VLCMain sharedInstance] getControls] repeatAll]; + [[[VLCMain sharedInstance] controls] repeatAll]; else - [[[VLCMain sharedInstance] getControls] repeatOff]; + [[[VLCMain sharedInstance] controls] repeatOff]; - [[[VLCMain sharedInstance] getControls] shuffle]; + [[[VLCMain sharedInstance] controls] shuffle]; pl_Release( VLCIntf ); } @@ -553,7 +553,7 @@ if( [[VLCMain sharedInstance] isPlaylistCollapsed] == NO ) { /* update our info-panel to reflect the new item, if we aren't collapsed */ - [[[VLCMain sharedInstance] getInfo] updatePanelWithItem:p_item->p_input]; + [[[VLCMain sharedInstance] info] updatePanelWithItem:p_item->p_input]; } } } diff --git a/modules/gui/macosx/playlistinfo.m b/modules/gui/macosx/playlistinfo.m index 5031f9203a..6a2b8ce8c6 100644 --- a/modules/gui/macosx/playlistinfo.m +++ b/modules/gui/macosx/playlistinfo.m @@ -452,7 +452,7 @@ error: if( [[o_mi title] isEqualToString: _NS("Information")] ) { - return ![[[VLCMain sharedInstance] getPlaylist] isSelectionEmpty]; + return ![[[VLCMain sharedInstance] playlist] isSelectionEmpty]; } return TRUE; @@ -505,7 +505,7 @@ error: o_value = [o_item_value copy]; i_object_id = i_id; o_parent = o_parent_item; - p_item = [[[VLCMain sharedInstance] getInfo] item]; + p_item = [[[VLCMain sharedInstance] info] item]; o_children = nil; } return( self ); @@ -584,7 +584,7 @@ error: - (void)refresh { input_item_t * oldItem = p_item; - p_item = [[[VLCMain sharedInstance] getInfo] item]; + p_item = [[[VLCMain sharedInstance] info] item]; if( oldItem && oldItem != p_item ) vlc_gc_decref( oldItem ); [o_children release]; diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m index 0a29493f85..91dab2bec1 100644 --- a/modules/gui/macosx/prefs.m +++ b/modules/gui/macosx/prefs.m @@ -228,7 +228,7 @@ static VLCPrefs *_o_sharedMainInstance = nil; [o_prefs_window orderOut: self]; [[o_basicFull_matrix cellAtRow:0 column:0] setState: NSOnState]; [[o_basicFull_matrix cellAtRow:0 column:1] setState: NSOffState]; - [[[VLCMain sharedInstance] getSimplePreferences] showSimplePrefs]; + [[[VLCMain sharedInstance] simplePreferences] showSimplePrefs]; } - (void)loadConfigTree @@ -505,15 +505,15 @@ static VLCPrefs *_o_sharedMainInstance = nil; NSRect frame; while( ( widget = [enumerator nextObject] ) ) - if( i_max_label < [widget getLabelSize] ) - i_max_label = [widget getLabelSize]; + if( i_max_label < [widget labelSize] ) + i_max_label = [widget labelSize]; enumerator = [_subviews objectEnumerator]; while( ( widget = [enumerator nextObject] ) ) { int i_widget; - i_widget = [widget getViewType]; + i_widget = [widget viewType]; i_yPos += [VLCConfigControl calcVerticalMargin:i_widget lastItem:i_lastItem]; [widget setYPos:i_yPos]; frame = [widget frame]; diff --git a/modules/gui/macosx/prefs_widgets.h b/modules/gui/macosx/prefs_widgets.h index ef55cec980..79823495cb 100644 --- a/modules/gui/macosx/prefs_widgets.h +++ b/modules/gui/macosx/prefs_widgets.h @@ -40,16 +40,16 @@ + (VLCConfigControl *)newControl: (module_config_t *)_p_item withView: (NSView *)o_parent_view; - (id)initWithFrame: (NSRect)frame item: (module_config_t *)p_item; -- (NSString *)getName; -- (int)getType; -- (int)getViewType; +- (NSString *)name; +- (int)type; +- (int)viewType; - (BOOL)isAdvanced; - (void)setYPos:(int)i_yPos; - (int)intValue; - (float)floatValue; - (char *)stringValue; - (void)applyChanges; -- (int)getLabelSize; +- (int)labelSize; - (void) alignWithXPosition:(int)i_xPos; static NSMenu *o_keys_menu = nil; diff --git a/modules/gui/macosx/prefs_widgets.m b/modules/gui/macosx/prefs_widgets.m index 3cb152b19d..044f0e64e8 100644 --- a/modules/gui/macosx/prefs_widgets.m +++ b/modules/gui/macosx/prefs_widgets.m @@ -863,17 +863,17 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ return p_control; } -- (NSString *)getName +- (NSString *)name { return [[VLCMain sharedInstance] localizedString: psz_name]; } -- (int)getType +- (int)type { return i_type; } -- (int)getViewType +- (int)viewType { return i_view_type; } @@ -926,7 +926,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ } } -- (int)getLabelSize +- (int)labelSize { return [o_label frame].size.width; } @@ -1132,7 +1132,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP]; /* is it a directory */ - b_directory = ( [self getType] == CONFIG_ITEM_DIRECTORY ) ? YES : NO; + b_directory = ( [self type] == CONFIG_ITEM_DIRECTORY ) ? YES : NO; /* add the label */ if( p_item->psz_text ) diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m index 6cefd2ed1e..fe0579404e 100644 --- a/modules/gui/macosx/simple_prefs.m +++ b/modules/gui/macosx/simple_prefs.m @@ -626,7 +626,7 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des [o_sprefs_win orderOut: self]; [[o_sprefs_basicFull_matrix cellAtRow:0 column:0] setState: NSOffState]; [[o_sprefs_basicFull_matrix cellAtRow:0 column:1] setState: NSOnState]; - [[[VLCMain sharedInstance] getPreferences] showPrefs]; + [[[VLCMain sharedInstance] preferences] showPrefs]; } else msg_Warn( p_intf, "unknown buttonAction sender" ); @@ -1276,7 +1276,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch if( key ) { i_key |= CocoaKeyToVLC( key ); - return [[[VLCMain sharedInstance] getSimplePreferences] changeHotkeyTo: i_key]; + return [[[VLCMain sharedInstance] simplePreferences] changeHotkeyTo: i_key]; } return FALSE; } @@ -1292,6 +1292,6 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch - (void)changeFont:(id)sender { - [[[VLCMain sharedInstance] getSimplePreferences] changeFont: sender]; + [[[VLCMain sharedInstance] simplePreferences] changeFont: sender]; } @end diff --git a/modules/gui/macosx/vout.h b/modules/gui/macosx/vout.h index 3a35d119f6..6b57f7a523 100644 --- a/modules/gui/macosx/vout.h +++ b/modules/gui/macosx/vout.h @@ -34,11 +34,11 @@ NSMutableArray * o_embedded_array; } -- (id)getEmbeddedVout; +- (id)embeddedVout; - (void)releaseEmbeddedVout: (id)o_vout_view; - (void)addEmbeddedVout: (id)o_vout_view; - (BOOL)windowContainsEmbedded: (id)o_window; -- (id)getViewForWindow: (id)o_window; +- (id)viewForWindow: (id)o_window; @end @@ -70,11 +70,11 @@ - (void)toggleFullscreen; - (BOOL)isFullscreen; - (void)snapshot; -- (id)getWindow; +- (id)voutWindow; + (id)voutView: (vout_thread_t *)p_vout subView: (NSView *) view frame: (NSRect *) s_frame; -+ (vout_thread_t *)getRealVout: (vout_thread_t *)p_vout; ++ (vout_thread_t *)realVout: (vout_thread_t *)p_vout; - (void)enterFullscreen; - (void)leaveFullscreen; diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m index 618831568b..9027baf14d 100644 --- a/modules/gui/macosx/vout.m +++ b/modules/gui/macosx/vout.m @@ -80,7 +80,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, return self; } -- (id)getEmbeddedVout +- (id)embeddedVout { unsigned int i; @@ -122,10 +122,10 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, { NSLog( @"We were not given a VLCVoutWindow" ); }*/ - return ([self getViewForWindow: o_window] == nil ? NO : YES ); + return ([self viewForWindow: o_window] == nil ? NO : YES ); } -- (id)getViewForWindow: (id)o_window +- (id)viewForWindow: (id)o_window { if( o_embedded_array != nil ) { @@ -135,7 +135,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, { while( (o_current_embedded = [o_enumerator nextObject]) ) { - if( [o_current_embedded getWindow] == o_window ) + if( [o_current_embedded voutWindow] == o_window ) { return o_current_embedded; } @@ -182,7 +182,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, return NO; } - p_real_vout = [VLCVoutView getRealVout: p_vout]; + p_real_vout = [VLCVoutView realVout: p_vout]; /* Get the pref value when this is the first time, otherwise retrieve the device from the top level video-device var */ if( var_Type( p_real_vout->p_libvlc, "video-device" ) == 0 ) @@ -266,10 +266,10 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, - (void)closeVout { - [[[[VLCMain sharedInstance] getControls] getFSPanel] fadeOut]; + [[[[VLCMain sharedInstance] controls] fspanel] fadeOut]; /* Make sure we don't see a white flash */ - [[self window] disableScreenUpdatesUntilFlush]; + [[self voutWindow] disableScreenUpdatesUntilFlush]; [o_view removeFromSuperview]; o_view = nil; p_vout = NULL; @@ -460,14 +460,14 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, UpdateSystemActivity( UsrActivity ); } -- (id)getWindow +- (id)voutWindow { return o_window; } - (void)scrollWheel:(NSEvent *)theEvent { - VLCControls * o_controls = (VLCControls *)[[NSApp delegate] getControls]; + VLCControls * o_controls = (VLCControls *)[[NSApp delegate] controls]; [o_controls scrollWheel: theEvent]; } @@ -541,7 +541,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ( [o_event modifierFlags] & NSControlKeyMask ) ) ) { msg_Dbg( p_vout, "received NSRightMouseDown (generic method) or Ctrl clic" ); - [NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] voutView]]; + [NSMenu popUpContextMenu: [[VLCMain sharedInstance] voutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] controls] voutView]]; } } @@ -567,7 +567,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, if( p_vout && [o_event type] == NSRightMouseDown ) { msg_Dbg( p_vout, "received NSRightMouseDown (specific method)" ); - [NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] voutView]]; + [NSMenu popUpContextMenu: [[VLCMain sharedInstance] voutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] controls] voutView]]; } [super mouseDown: o_event]; @@ -610,7 +610,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, /* FIXME: this isn't the appropriate place, but we can't receive * NSRightMouseDown some how */ msg_Dbg( p_vout, "received NSRightMouseUp" ); - [NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] voutView]]; + [NSMenu popUpContextMenu: [[VLCMain sharedInstance] voutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] controls] voutView]]; } [super mouseUp: o_event]; @@ -672,7 +672,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, var_Set( p_vout, "mouse-moved", val ); } if( [self isFullscreen] ) - [[[[VLCMain sharedInstance] getControls] getFSPanel] fadeIn]; + [[[[VLCMain sharedInstance] controls] fspanel] fadeIn]; } [super mouseMoved: o_event]; @@ -697,7 +697,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, /* Class methods used by the different vout modules */ -+ (vout_thread_t *)getRealVout: (vout_thread_t *)p_vout ++ (vout_thread_t *)realVout: (vout_thread_t *)p_vout { /* p_real_vout: the vout we have to use to check for video-on-top and a few other things. If we are the QuickTime output, it's us. @@ -751,8 +751,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, !(var_GetBool( p_vout, "macosx-background" )) && var_GetBool( p_vout, "embedded-video") ) { - o_return = [[[VLCMain sharedInstance] getEmbeddedList] - getEmbeddedVout]; + o_return = [[[VLCMain sharedInstance] embeddedList] embeddedVout]; } } } @@ -922,7 +921,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, if(self = [super initWithFrame: frameRect]) { b_used = NO; - [[[VLCMain sharedInstance] getEmbeddedList] addEmbeddedVout: self]; + [[[VLCMain sharedInstance] embeddedList] addEmbeddedVout: self]; o_embeddedwindow = nil; /* Filled later on in -awakeFromNib */ } return self; @@ -1001,7 +1000,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, /* FIXME: fix core */ [o_embeddedwindow performSelector:@selector(orderOut:) withObject:nil afterDelay:3.]; - [[[VLCMain sharedInstance] getEmbeddedList] releaseEmbeddedVout: self]; + [[[VLCMain sharedInstance] embeddedList] releaseEmbeddedVout: self]; } - (void)enterFullscreen @@ -1125,8 +1124,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, [self setLevel:NSNormalWindowLevel]; /* tell the fspanel to move itself to front next time it's triggered */ - [[[[VLCMain sharedInstance] getControls] getFSPanel] setVoutWasUpdated: i_device]; - [[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil]; + [[[[VLCMain sharedInstance] controls] fspanel] setVoutWasUpdated: i_device]; + [[[[VLCMain sharedInstance] controls] fspanel] setActive: nil]; fullscreen = YES; } @@ -1138,7 +1137,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, [NSScreen unblackoutScreens]; - [[[[VLCMain sharedInstance] getControls] getFSPanel] setNonActive: nil]; + [[[[VLCMain sharedInstance] controls] fspanel] setNonActive: nil]; SetSystemUIMode( kUIModeNormal, kUIOptionAutoShowMenuBar); [self setFrame:initialFrame display:YES animate:YES]; [self setMovableByWindowBackground: YES]; diff --git a/modules/gui/macosx/voutgl.m b/modules/gui/macosx/voutgl.m index cdda029865..6921963e1d 100644 --- a/modules/gui/macosx/voutgl.m +++ b/modules/gui/macosx/voutgl.m @@ -357,7 +357,7 @@ static void Unlock( vout_thread_t * p_vout ) p_vout->p_sys->s_frame.size = [p_vout->p_sys->o_vout_view frame].size; p_vout->p_sys->s_frame.origin = - [[p_vout->p_sys->o_vout_view getWindow ]frame].origin; + [[p_vout->p_sys->o_vout_view voutWindow]frame].origin; p_vout->p_sys->b_saved_frame = true; } @@ -673,7 +673,7 @@ static int aglManage( vout_thread_t * p_vout ) if( !p_vout->p_sys->theWindow ) { /* Create a window */ - WindowAttributes windowAttrs; + WindowAttributes windowAttrs; windowAttrs = kWindowStandardDocumentAttributes | kWindowStandardHandlerAttribute diff --git a/modules/gui/macosx/wizard.h b/modules/gui/macosx/wizard.h index 1ea98226a1..af67ea097c 100644 --- a/modules/gui/macosx/wizard.h +++ b/modules/gui/macosx/wizard.h @@ -178,7 +178,7 @@ - (void)resetWizard; - (void)createOpts; - (void)rebuildCodecMenus; -- (id)getPlaylistWizard; +- (id)playlistWizard; - (void)initWithExtractValuesFrom: (NSString *)from to: (NSString *)to ofItem: (NSString *)item; @end diff --git a/modules/gui/macosx/wizard.m b/modules/gui/macosx/wizard.m index e9d6dc4986..ade0a61f7f 100644 --- a/modules/gui/macosx/wizard.m +++ b/modules/gui/macosx/wizard.m @@ -477,7 +477,7 @@ static VLCWizard *_o_sharedInstance = nil; [o_wizard_window close]; } -- (id)getPlaylistWizard +- (id)playlistWizard { return o_playlist_wizard; } @@ -1665,7 +1665,7 @@ static VLCWizard *_o_sharedInstance = nil; @"Input"]) { /* reset the wizard before going backwards. Otherwise, we might get - * unwanted behaviours in the Encap-Selection */ + * unwanted behaviour in the Encap-Selection */ [self resetWizard]; /* show "Hello" */ [o_tab_pageHolder selectTabViewItemAtIndex:0];