return nil;
}
- VLCControls * o_controls = (VLCControls *)[[NSApp delegate] getControls];
+ VLCControls * o_controls = (VLCControls *)[[NSApp delegate] controls];
if ( o_controls )
{
@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];
}
- (void)initStrings;
- (void)showBookmarks;
-- (id)getDataTable;
+- (id)dataTable;
@end
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:
* callback stuff
*****************************************************************************/
--(id)getDataTable
+-(id)dataTable
{
return o_tbl_dataTable;
}
- (IBAction)goToSpecificTime:(id)sender;
-- (id)getFSPanel;
+- (id)fspanel;
@end
{
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"] )
[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];
}
}
}
-- (id)getFSPanel
+- (id)fspanel
{
if( o_fs_panel )
return o_fs_panel;
while( (o_window = [o_enumerator nextObject]))
{
if( [[o_window className] isEqualToString: @"VLCVoutWindow"] ||
- [[[VLCMain sharedInstance] getEmbeddedList]
+ [[[VLCMain sharedInstance] embeddedList]
windowContainsEmbedded: o_window])
{
bEnabled = TRUE;
- (void)mouseDown: (NSEvent *)ourEvent
{
if( [ourEvent clickCount] > 1 )
- [[[VLCMain sharedInstance] getControls] goToSpecificTime: nil];
+ [[[VLCMain sharedInstance] controls] goToSpecificTime: nil];
else
[[VLCMain sharedInstance] timeFieldWasClicked: self];
}
-(void)showProgressDialog: (NSValue *)o_value;
-(IBAction)progDialogAction:(id)sender;
--(id)getErrorPanel;
+-(id)errorPanel;
@end
\ No newline at end of file
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)
b_progress_cancelled = YES;
}
--(id)getErrorPanel
+-(id)errorPanel
{
return o_error_panel;
}
- (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];
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 */
[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)
- (void)awakeFromNib;
- (void)setValue: (float)value forSlider: (int)index;
-- (id)getSliderByIndex: (int)index;
+- (id)sliderByIndex: (int)index;
- (void)setBandSlidersValues: (float *)values;
- (void)initBandSliders;
}
-- (id)getSliderByIndex:(int)index
+- (id)sliderByIndex:(int)index
{
switch(index)
{
- (void)setValue:(float)value forSlider:(int)index
{
- id slider = [self getSliderByIndex:index];
+ id slider = [self sliderByIndex:index];
if (slider != nil)
{
- (IBAction)moreInfoVideoFilters:(id)sender;
+ (VLCExtended *)sharedInstance;
-- (BOOL)getConfigChanged;
+- (BOOL)configChanged;
- (void)showPanel;
- (void)initStrings;
[self initStrings];
}
-- (BOOL)getConfigChanged
+- (BOOL)configChanged
{
return o_config_changed;
}
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];
- (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];
- (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
- (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
- (IBAction)fsVolumeSliderUpdate:(id)sender
{
- [[[VLCMain sharedInstance] getControls] volumeSliderUpdated: sender];
+ [[[VLCMain sharedInstance] controls] volumeSliderUpdated: sender];
}
#define addImage(image, _x, _y, mode, _width) \
*****************************************************************************/
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.
+ (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;
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;
p_intf = p_mainintf;
}
-- (intf_thread_t *)getIntf {
+- (intf_thread_t *)intf {
return p_intf;
}
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];
}
#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;
return nil;
}
-- (id)getSimplePreferences
+- (id)simplePreferences
{
if( !o_sprefs )
return nil;
return o_sprefs;
}
-- (id)getPreferences
+- (id)preferences
{
if( !o_prefs )
return nil;
return o_prefs;
}
-- (id)getPlaylist
+- (id)playlist
{
if( o_playlist )
return o_playlist;
return ![o_btn_playlist state];
}
-- (id)getInfo
+- (id)info
{
if( o_info )
return o_info;
return nil;
}
-- (id)getWizard
+- (id)wizard
{
if( o_wizard )
return o_wizard;
return nil;
}
-- (id)getVLM
+- (id)vlm
{
return o_vlm;
}
-- (id)getBookmarks
+- (id)bookmarks
{
if( o_bookmarks )
return o_bookmarks;
return nil;
}
-- (id)getEmbeddedList
+- (id)embeddedList
{
if( o_embedded_list )
return o_embedded_list;
return nil;
}
-- (id)getCoreDialogProvider
+- (id)coreDialogProvider
{
if( o_coredialogs )
return o_coredialogs;
return nil;
}
-- (id)getMainIntfPgbar
+- (id)mainIntfPgbar
{
if( o_main_pgbar )
return o_main_pgbar;
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;
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;
}
[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];
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];
free(name);
[self setScrollField: aString stopAfter:-1];
- [[[self getControls] getFSPanel] setStreamTitle: aString];
+ [[[self controls] fspanel] setStreamTitle: aString];
[[o_controls voutView] updateTitle];
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];
}
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;
}
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;
{
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")];
}
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")];
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 );
}
- (IBAction)viewErrorsAndWarnings:(id)sender
{
- [[[self getCoreDialogProvider] getErrorPanel] showPanel];
+ [[[self coreDialogProvider] errorPanel] showPanel];
}
- (IBAction)showMessagesPanel:(id)sender
else
[o_btn_playlist setState: YES];
- [[self getPlaylist] outlineViewSelectionDidChange: NULL];
+ [[self playlist] outlineViewSelectionDidChange: NULL];
}
- (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)proposedFrameSize
return TRUE;
return [[VLCMain sharedInstance] hasDefinedShortcutKey:o_event] ||
- [(VLCControls *)[[VLCMain sharedInstance] getControls] keyEvent:o_event];
+ [(VLCControls *)[[VLCMain sharedInstance] controls] keyEvent:o_event];
}
@end
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;
}
}
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;
}
}
}
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")] )
{
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];
{
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
- (IBAction)eyetvLaunch:(id)sender
{
- [[[VLCMain sharedInstance] getEyeTVController] launchEyeTV];
+ [[[VLCMain sharedInstance] eyeTVController] launchEyeTV];
}
- (IBAction)eyetvGetPlugin:(id)sender
[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
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 */
}
- (void)setMRL:(NSArray *)o_mrl_string;
-- (NSArray *)getMRL;
+- (NSArray *)mrl;
- (void)setTranscode:(NSString *)o_transcode_string;
- (void)initStrings;
o_mrl = [o_mrl_array copy];
}
-- (NSArray *)getMRL
+- (NSArray *)mrl
{
return [o_mrl copy];
}
case NSEnterCharacter:
case NSCarriageReturnCharacter:
- [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist] playItem:self];
+ [(VLCPlaylist *)[[VLCMain sharedInstance] playlist] playItem:self];
break;
default:
// 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 );
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 );
}
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];
}
}
}
if( [[o_mi title] isEqualToString: _NS("Information")] )
{
- return ![[[VLCMain sharedInstance] getPlaylist] isSelectionEmpty];
+ return ![[[VLCMain sharedInstance] playlist] isSelectionEmpty];
}
return TRUE;
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 );
- (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];
[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
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];
+ (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;
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;
}
}
}
-- (int)getLabelSize
+- (int)labelSize
{
return [o_label frame].size.width;
}
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 )
[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" );
if( key )
{
i_key |= CocoaKeyToVLC( key );
- return [[[VLCMain sharedInstance] getSimplePreferences] changeHotkeyTo: i_key];
+ return [[[VLCMain sharedInstance] simplePreferences] changeHotkeyTo: i_key];
}
return FALSE;
}
- (void)changeFont:(id)sender
{
- [[[VLCMain sharedInstance] getSimplePreferences] changeFont: sender];
+ [[[VLCMain sharedInstance] simplePreferences] changeFont: sender];
}
@end
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
- (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;
return self;
}
-- (id)getEmbeddedVout
+- (id)embeddedVout
{
unsigned int i;
{
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 )
{
{
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;
}
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 )
- (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;
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];
}
( [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]];
}
}
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];
/* 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];
var_Set( p_vout, "mouse-moved", val );
}
if( [self isFullscreen] )
- [[[[VLCMain sharedInstance] getControls] getFSPanel] fadeIn];
+ [[[[VLCMain sharedInstance] controls] fspanel] fadeIn];
}
[super mouseMoved: o_event];
/* 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.
!(var_GetBool( p_vout, "macosx-background" )) &&
var_GetBool( p_vout, "embedded-video") )
{
- o_return = [[[VLCMain sharedInstance] getEmbeddedList]
- getEmbeddedVout];
+ o_return = [[[VLCMain sharedInstance] embeddedList] embeddedVout];
}
}
}
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;
/* FIXME: fix core */
[o_embeddedwindow performSelector:@selector(orderOut:) withObject:nil afterDelay:3.];
- [[[VLCMain sharedInstance] getEmbeddedList] releaseEmbeddedVout: self];
+ [[[VLCMain sharedInstance] embeddedList] releaseEmbeddedVout: self];
}
- (void)enterFullscreen
[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;
}
[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];
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;
}
if( !p_vout->p_sys->theWindow )
{
/* Create a window */
- WindowAttributes windowAttrs;
+ WindowAttributes windowAttrs;
windowAttrs = kWindowStandardDocumentAttributes
| kWindowStandardHandlerAttribute
- (void)resetWizard;
- (void)createOpts;
- (void)rebuildCodecMenus;
-- (id)getPlaylistWizard;
+- (id)playlistWizard;
- (void)initWithExtractValuesFrom: (NSString *)from to: (NSString *)to ofItem: (NSString *)item;
@end
[o_wizard_window close];
}
-- (id)getPlaylistWizard
+- (id)playlistWizard
{
return o_playlist_wizard;
}
@"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];