/*****************************************************************************
- * intf.m: MacOS X interface plugin
+ * intf.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
- * $Id: intf.m,v 1.97 2003/10/29 02:13:04 hartman Exp $
+ * Copyright (C) 2002-2004 VideoLAN
+ * $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
- * Derk-Jan Hartman <thedj@users.sourceforge.net>
+ * Derk-Jan Hartman <hartman at videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
memset( p_intf->p_sys, 0, sizeof( *p_intf->p_sys ) );
p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
-
+
/* Put Cocoa into multithread mode as soon as possible.
* http://developer.apple.com/techpubs/macosx/Cocoa/
* TasksAndConcepts/ProgrammingTopics/Multithreading/index.html
p_intf->p_sys->o_sendport = [[NSPort port] retain];
p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
+ p_intf->b_play = VLC_TRUE;
p_intf->pf_run = Run;
- [[VLCApplication sharedApplication] autorelease];
+ [VLCApplication sharedApplication];
[NSApp setIntf: p_intf];
[NSBundle loadNibNamed: @"MainMenu" owner: NSApp];
- (void)terminate:(id)sender
{
p_intf->p_vlc->b_die = VLC_TRUE;
+ [super terminate:sender];
+}
+
+
+/*****************************************************************************
+ * hasDefinedShortcutKey: Check to see if the key press is a defined VLC
+ * shortcut key. If it is, pass it off to VLC for handling and return YES,
+ * otherwise ignore it and return NO (where it will get handled by Cocoa).
+ *****************************************************************************/
+- (BOOL)hasDefinedShortcutKey:(NSEvent *)o_event
+{
+ unichar key = 0;
+ vlc_value_t val;
+ unsigned int i_pressed_modifiers = 0;
+ struct hotkey *p_hotkeys;
+ int i;
+
+ val.i_int = 0;
+ p_hotkeys = p_intf->p_vlc->p_hotkeys;
+
+ i_pressed_modifiers = [o_event modifierFlags];
+
+ if( i_pressed_modifiers & NSShiftKeyMask )
+ val.i_int |= KEY_MODIFIER_SHIFT;
+ if( i_pressed_modifiers & NSControlKeyMask )
+ val.i_int |= KEY_MODIFIER_CTRL;
+ if( i_pressed_modifiers & NSAlternateKeyMask )
+ val.i_int |= KEY_MODIFIER_ALT;
+ if( i_pressed_modifiers & NSCommandKeyMask )
+ val.i_int |= KEY_MODIFIER_COMMAND;
+
+ key = [[o_event charactersIgnoringModifiers] characterAtIndex: 0];
+
+ val.i_int |= CocoaKeyToVLC( key );
+
+ for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
+ {
+ if( p_hotkeys[i].i_key == val.i_int )
+ {
+ var_Set( p_intf->p_vlc, "key-pressed", val );
+ return YES;
+ }
+ }
+
+ return NO;
}
@end
vlc_value_t old_val, vlc_value_t new_val, void *param )
{
intf_thread_t * p_intf = [NSApp getIntf];
- p_intf->p_sys->b_playlist_update = VLC_TRUE;
- p_intf->p_sys->b_intf_update = VLC_TRUE;
+ p_intf->p_sys->b_playlist_update = TRUE;
+ p_intf->p_sys->b_intf_update = TRUE;
return VLC_SUCCESS;
}
static struct
{
unichar i_nskey;
- int i_vlckey;
+ unsigned int i_vlckey;
} nskeys_to_vlckeys[] =
{
{ NSUpArrowFunctionKey, KEY_UP },
{0,0}
};
-int CocoaConvertKey( unichar i_key )
+unichar VLCKeyToCocoa( unsigned int i_key )
{
- int i;
+ unsigned int i;
+
+ for( i = 0; nskeys_to_vlckeys[i].i_vlckey != 0; i++ )
+ {
+ if( nskeys_to_vlckeys[i].i_vlckey == (i_key & ~KEY_MODIFIER) )
+ {
+ return nskeys_to_vlckeys[i].i_nskey;
+ }
+ }
+ return (unichar)(i_key & ~KEY_MODIFIER);
+}
+
+unsigned int CocoaKeyToVLC( unichar i_key )
+{
+ unsigned int i;
for( i = 0; nskeys_to_vlckeys[i].i_nskey != 0; i++ )
{
return nskeys_to_vlckeys[i].i_vlckey;
}
}
- return (int)i_key;
+ return (unsigned int)i_key;
+}
+
+unsigned int VLCModifiersToCocoa( unsigned int i_key )
+{
+ unsigned int new = 0;
+ if( i_key & KEY_MODIFIER_COMMAND )
+ new |= NSCommandKeyMask;
+ if( i_key & KEY_MODIFIER_ALT )
+ new |= NSAlternateKeyMask;
+ if( i_key & KEY_MODIFIER_SHIFT )
+ new |= NSShiftKeyMask;
+ if( i_key & KEY_MODIFIER_CTRL )
+ new |= NSControlKeyMask;
+ return new;
}
/*****************************************************************************
- (void)awakeFromNib
{
- [o_window setTitle: _NS("VLC - Controller")];
+ unsigned int i_key = 0;
+ intf_thread_t * p_intf = [NSApp getIntf];
+ playlist_t *p_playlist;
+ vlc_value_t val;
+
+ [self initStrings];
[o_window setExcludedFromWindowsMenu: TRUE];
+ [o_msgs_panel setExcludedFromWindowsMenu: TRUE];
+ [o_msgs_panel setDelegate: self];
+
+ i_key = config_GetInt( p_intf, "key-quit" );
+ [o_mi_quit setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_quit setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-play-pause" );
+ [o_mi_play setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_play setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-stop" );
+ [o_mi_stop setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_stop setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-faster" );
+ [o_mi_faster setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_faster setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-slower" );
+ [o_mi_slower setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_slower setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-prev" );
+ [o_mi_previous setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_previous setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-next" );
+ [o_mi_next setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_next setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-jump+10sec" );
+ [o_mi_fwd setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_fwd setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-jump-10sec" );
+ [o_mi_bwd setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_bwd setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-jump+1min" );
+ [o_mi_fwd1m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_fwd1m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-jump-1min" );
+ [o_mi_bwd1m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_bwd1m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-jump+5min" );
+ [o_mi_fwd5m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_fwd5m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-jump-5min" );
+ [o_mi_bwd5m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_bwd5m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-vol-up" );
+ [o_mi_vol_up setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_vol_up setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-vol-down" );
+ [o_mi_vol_down setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_vol_down setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-vol-mute" );
+ [o_mi_mute setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_mute setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-fullscreen" );
+ [o_mi_fullscreen setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_fullscreen setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+
+ var_Create( p_intf, "intf-change", VLC_VAR_BOOL );
+
+ [self setSubmenusEnabled: FALSE];
+ [self manageVolumeSlider];
+
+ p_playlist = (playlist_t *) vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+
+ if( p_playlist )
+ {
+ /* Check if we need to start playing */
+ if( p_intf->b_play )
+ {
+ playlist_Play( p_playlist );
+ }
+ [o_btn_fullscreen setState: ( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool )];
+ vlc_object_release( p_playlist );
+ }
+}
+
+- (void)initStrings
+{
+ [o_window setTitle: _NS("VLC - Controller")];
+ [o_scrollfield setStringValue: _NS("VLC media player")];
/* button controls */
- [o_btn_playlist setToolTip: _NS("Playlist")];
[o_btn_prev setToolTip: _NS("Previous")];
- [o_btn_slower setToolTip: _NS("Slower")];
+ [o_btn_rewind setToolTip: _NS("Rewind")];
[o_btn_play setToolTip: _NS("Play")];
[o_btn_stop setToolTip: _NS("Stop")];
- [o_btn_faster setToolTip: _NS("Faster")];
+ [o_btn_ff setToolTip: _NS("Fast Forward")];
[o_btn_next setToolTip: _NS("Next")];
- [o_btn_prefs setToolTip: _NS("Preferences")];
+ [o_btn_fullscreen setToolTip: _NS("Fullscreen")];
[o_volumeslider setToolTip: _NS("Volume")];
[o_timeslider setToolTip: _NS("Position")];
/* messages panel */
- [o_msgs_panel setDelegate: self];
[o_msgs_panel setTitle: _NS("Messages")];
- [o_msgs_panel setExcludedFromWindowsMenu: TRUE];
[o_msgs_btn_crashlog setTitle: _NS("Open CrashLog")];
/* main menu */
[o_mi_about setTitle: _NS("About VLC media player")];
[o_mi_prefs setTitle: _NS("Preferences...")];
+ [o_mi_add_intf setTitle: _NS("Add Interface")];
+ [o_mu_add_intf setTitle: _NS("Add Interface")];
+ [o_mi_services setTitle: _NS("Services")];
[o_mi_hide setTitle: _NS("Hide VLC")];
[o_mi_hide_others setTitle: _NS("Hide Others")];
[o_mi_show_all setTitle: _NS("Show All")];
[o_mi_quit setTitle: _NS("Quit VLC")];
[o_mu_file setTitle: _ANS("1:File")];
- [o_mi_open_generic setTitle: _NS("Open...")];
- [o_mi_open_file setTitle: _NS("Open File...")];
+ [o_mi_open_generic setTitle: _NS("Open File...")];
+ [o_mi_open_file setTitle: _NS("Quick Open File...")];
[o_mi_open_disc setTitle: _NS("Open Disc...")];
[o_mi_open_net setTitle: _NS("Open Network...")];
[o_mi_open_recent setTitle: _NS("Open Recent")];
[o_mi_slower setTitle: _NS("Slower")];
[o_mi_previous setTitle: _NS("Previous")];
[o_mi_next setTitle: _NS("Next")];
- [o_mi_random setTitle: _NS("Shuffle")];
- [o_mi_repeat setTitle: _NS("Repeat Item")];
- [o_mi_loop setTitle: _NS("Repeat Playlist")];
+ [o_mi_random setTitle: _NS("Random")];
+ [o_mi_repeat setTitle: _NS("Repeat One")];
+ [o_mi_loop setTitle: _NS("Repeat All")];
[o_mi_fwd setTitle: _NS("Step Forward")];
[o_mi_bwd setTitle: _NS("Step Backward")];
+
[o_mi_program setTitle: _NS("Program")];
[o_mu_program setTitle: _NS("Program")];
[o_mi_title setTitle: _NS("Title")];
[o_mi_vol_up setTitle: _NS("Volume Up")];
[o_mi_vol_down setTitle: _NS("Volume Down")];
[o_mi_mute setTitle: _NS("Mute")];
- [o_mi_audiotrack setTitle: _NS("Audio track")];
- [o_mu_audiotrack setTitle: _NS("Audio track")];
- [o_mi_channels setTitle: _NS("Audio channels")];
- [o_mu_channels setTitle: _NS("Audio channels")];
- [o_mi_device setTitle: _NS("Audio device")];
- [o_mu_device setTitle: _NS("Audio device")];
+ [o_mi_audiotrack setTitle: _NS("Audio Track")];
+ [o_mu_audiotrack setTitle: _NS("Audio Track")];
+ [o_mi_channels setTitle: _NS("Audio Channels")];
+ [o_mu_channels setTitle: _NS("Audio Channels")];
+ [o_mi_device setTitle: _NS("Audio Device")];
+ [o_mu_device setTitle: _NS("Audio Device")];
+ [o_mi_visual setTitle: _NS("Visualizations")];
+ [o_mu_visual setTitle: _NS("Visualizations")];
[o_mu_video setTitle: _NS("Video")];
[o_mi_half_window setTitle: _NS("Half Size")];
[o_mi_normal_window setTitle: _NS("Normal Size")];
[o_mi_double_window setTitle: _NS("Double Size")];
- [o_mi_fittoscreen setTitle: _NS("Fit To Screen")];
+ [o_mi_fittoscreen setTitle: _NS("Fit to Screen")];
[o_mi_fullscreen setTitle: _NS("Fullscreen")];
- [o_mi_floatontop setTitle: _NS("Float On Top")];
- [o_mi_videotrack setTitle: _NS("Video track")];
- [o_mu_videotrack setTitle: _NS("Video track")];
- [o_mi_screen setTitle: _NS("Video device")];
- [o_mu_screen setTitle: _NS("Video device")];
- [o_mi_subtitle setTitle: _NS("Subtitles track")];
- [o_mu_subtitle setTitle: _NS("Subtitles track")];
+ [o_mi_floatontop setTitle: _NS("Float on Top")];
+ [o_mi_videotrack setTitle: _NS("Video Track")];
+ [o_mu_videotrack setTitle: _NS("Video Track")];
+ [o_mi_screen setTitle: _NS("Video Device")];
+ [o_mu_screen setTitle: _NS("Video Device")];
+ [o_mi_subtitle setTitle: _NS("Subtitles Track")];
+ [o_mu_subtitle setTitle: _NS("Subtitles Track")];
[o_mi_deinterlace setTitle: _NS("Deinterlace")];
[o_mu_deinterlace setTitle: _NS("Deinterlace")];
[o_dmi_stop setTitle: _NS("Stop")];
[o_dmi_next setTitle: _NS("Next")];
[o_dmi_previous setTitle: _NS("Previous")];
+ [o_dmi_mute setTitle: _NS("Mute")];
/* error panel */
[o_error setTitle: _NS("Error")];
[o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, please follow the instructions at:")];
[o_err_btn_msgs setTitle: _NS("Open Messages Window")];
[o_err_btn_dismiss setTitle: _NS("Dismiss")];
+ [o_err_ckbk_surpress setTitle: _NS("Suppress further errors")];
[o_info_window setTitle: _NS("Info")];
-
- [self setSubmenusEnabled: FALSE];
- [self manageVolumeSlider];
}
- (void)applicationWillFinishLaunching:(NSNotification *)o_notification
o_msg_arr = [[NSMutableArray arrayWithCapacity: 200] retain];
o_img_play = [[NSImage imageNamed: @"play"] retain];
+ o_img_play_pressed = [[NSImage imageNamed: @"play_blue"] retain];
o_img_pause = [[NSImage imageNamed: @"pause"] retain];
+ o_img_pause_pressed = [[NSImage imageNamed: @"pause_blue"] retain];
[p_intf->p_sys->o_sendport setDelegate: self];
[[NSRunLoop currentRunLoop]
[NSThread detachNewThreadSelector: @selector(manage)
toTarget: self withObject: nil];
+
+ [o_controls setupVarMenuItem: o_mi_add_intf target: (vlc_object_t *)p_intf
+ var: "intf-add" selector: @selector(toggleVar:)];
vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
}
return nil;
}
+- (id)getPlaylist
+{
+ if ( o_playlist )
+ {
+ return o_playlist;
+ }
+ return nil;
+}
+
+- (id)getInfo
+{
+ if ( o_info )
+ {
+ return o_info;
+ }
+ return nil;
+}
+
- (void)manage
{
NSDate * o_sleep_date;
while( !p_intf->b_die )
{
playlist_t * p_playlist;
-
+ vlc_value_t val;
vlc_mutex_lock( &p_intf->change_lock );
p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
if( p_playlist != NULL )
{
var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
+
#define p_input p_playlist->p_input
if( p_input )
else if( p_intf->p_sys->b_playing && !p_intf->b_die )
{
p_intf->p_sys->b_playing = FALSE;
- p_intf->p_sys->b_intf_update = TRUE;
}
#undef p_input
vlc_object_release( p_playlist );
+
+ if( var_Get( p_intf, "intf-change", &val )
+ >= 0 && val.b_bool )
+ {
+ p_intf->p_sys->b_fullscreen_update = TRUE;
+ }
+ val.b_bool = VLC_FALSE;
+ var_Set( p_intf,"intf-change",val);
}
vlc_mutex_unlock( &p_intf->change_lock );
if( p_intf->p_sys->b_current_title_update )
{
- vout_thread_t *p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
+ vout_thread_t *p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
+ FIND_ANYWHERE );
+
+ vlc_mutex_lock( &p_playlist->object_lock );
+ [o_scrollfield setStringValue: [NSString stringWithUTF8String:
+ p_playlist->pp_items[p_playlist->i_index]->input.psz_name]];
+ vlc_mutex_unlock( &p_playlist->object_lock );
+
if( p_vout != NULL )
{
id o_vout_wnd;
- NSEnumerator * o_enum = [[NSApp windows] objectEnumerator];
+ NSEnumerator * o_enum = [[NSApp orderedWindows] objectEnumerator];
while( ( o_vout_wnd = [o_enum nextObject] ) )
{
vlc_object_release( (vlc_object_t *)p_vout );
}
[o_playlist updateRowSelection];
- [o_info updateInfo];
+// [o_info updateInfo];
p_intf->p_sys->b_current_title_update = FALSE;
}
vlc_bool_t b_control = VLC_FALSE;
vlc_bool_t b_seekable = VLC_FALSE;
vlc_bool_t b_chapters = VLC_FALSE;
- vlc_value_t val;
b_plmul = p_playlist->i_size > 1;
/* seekable streams */
b_seekable = p_input->stream.b_seekable;
- /* control buttons for free pace streams */
+ /* check wether slow/fast motion is possible*/
b_control = p_input->stream.b_pace_control;
/* chapters & titles */
b_chapters = p_input->stream.i_area_nb > 1;
vlc_mutex_unlock( &p_input->stream.stream_lock );
-
- /* play status */
- var_Get( p_input, "state", &val );
- p_intf->p_sys->b_play_status = val.i_int != PAUSE_S;
- }
- else
- {
- /* play status */
- p_intf->p_sys->b_play_status = FALSE;
- [self setSubmenusEnabled: FALSE];
}
- [self playStatusUpdated: p_intf->p_sys->b_play_status];
-
[o_btn_stop setEnabled: b_input];
- [o_btn_faster setEnabled: b_control];
- [o_btn_slower setEnabled: b_control];
+ [o_btn_ff setEnabled: b_seekable];
+ [o_btn_rewind setEnabled: b_seekable];
[o_btn_prev setEnabled: (b_plmul || b_chapters)];
[o_btn_next setEnabled: (b_plmul || b_chapters)];
[o_timefield setStringValue: @"0:00:00"];
[self manageVolumeSlider];
-
p_intf->p_sys->b_intf_update = VLC_FALSE;
}
+ if( p_intf->p_sys->b_fullscreen_update )
+ {
+ vout_thread_t * p_vout;
+ vlc_value_t val;
+
+ [o_btn_fullscreen setState: ( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool ) ];
+
+ p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+ if( p_vout != NULL )
+ {
+ [o_btn_fullscreen setEnabled: VLC_TRUE];
+ vlc_object_release( p_vout );
+ }
+ else
+ {
+ [o_btn_fullscreen setEnabled: VLC_FALSE];
+ }
+ p_intf->p_sys->b_fullscreen_update = VLC_FALSE;
+ }
+
if( p_intf->p_sys->b_playing && p_input != NULL )
{
- vlc_value_t time, val;
+ vlc_value_t time;
NSString * o_time;
mtime_t i_seconds;
- var_Get( p_input, "state", &val );
-
- if( !p_input->b_die && ( p_intf->p_sys->b_play_status !=
- ( val.i_int != PAUSE_S ) ) )
- {
- p_intf->p_sys->b_play_status =
- !p_intf->p_sys->b_play_status;
-
- [self playStatusUpdated: p_intf->p_sys->b_play_status];
- }
if( p_input->stream.b_seekable )
{
(int) (i_seconds / 60 % 60),
(int) (i_seconds % 60)];
[o_timefield setStringValue: o_time];
+ }
+ if( p_input )
+ {
+ vlc_value_t val;
+ var_Get( p_input, "state", &val );
- /* disable screen saver */
- UpdateSystemActivity( UsrActivity );
+ if( val.i_int != PAUSE_S )
+ {
+ p_intf->p_sys->b_play_status = TRUE;
+ }
+ else
+ {
+ p_intf->p_sys->b_play_status = FALSE;
+ }
+ [self playStatusUpdated: p_intf->p_sys->b_play_status];
+ }
+ else
+ {
+ p_intf->p_sys->b_play_status = FALSE;
+ [self playStatusUpdated: p_intf->p_sys->b_play_status];
+ [self setSubmenusEnabled: FALSE];
}
#undef p_input
[o_controls setupVarMenuItem: o_mi_device target: (vlc_object_t *)p_aout
var: "audio-device" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_visual target: (vlc_object_t *)p_aout
+ var: "visual" selector: @selector(toggleVar:)];
vlc_object_release( (vlc_object_t *)p_aout );
}
{
int i_start, i_stop;
intf_thread_t * p_intf = [NSApp getIntf];
+ vlc_value_t quiet;
vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
i_stop = *p_intf->p_sys->p_sub->pi_stop;
[o_msg_lock unlock];
- if( i_type == 1 )
+ var_Get( p_intf->p_vlc, "verbose", &quiet );
+
+ if( i_type == 1 && quiet.i_int > -1 )
{
NSString *o_my_msg = [NSString stringWithFormat: @"%s: %s\n",
p_intf->p_sys->p_sub->p_msg[i_start].psz_module,
if( b_pause )
{
[o_btn_play setImage: o_img_pause];
+ [o_btn_play setAlternateImage: o_img_pause_pressed];
[o_btn_play setToolTip: _NS("Pause")];
[o_mi_play setTitle: _NS("Pause")];
[o_dmi_play setTitle: _NS("Pause")];
else
{
[o_btn_play setImage: o_img_play];
+ [o_btn_play setAlternateImage: o_img_play_pressed];
[o_btn_play setToolTip: _NS("Play")];
[o_mi_play setTitle: _NS("Play")];
[o_dmi_play setTitle: _NS("Play")];
[o_mi_title setEnabled: b_enabled];
[o_mi_chapter setEnabled: b_enabled];
[o_mi_audiotrack setEnabled: b_enabled];
+ [o_mi_visual setEnabled: b_enabled];
[o_mi_videotrack setEnabled: b_enabled];
[o_mi_subtitle setEnabled: b_enabled];
[o_mi_channels setEnabled: b_enabled];
{
NSEvent * o_event;
playlist_t * p_playlist;
+ vout_thread_t * p_vout;
intf_thread_t * p_intf = [NSApp getIntf];
- /*
- * Free playlists
- */
- msg_Dbg( p_intf, "removing all playlists" );
- while( (p_playlist = vlc_object_find( p_intf->p_vlc, VLC_OBJECT_PLAYLIST,
- FIND_CHILD )) )
+ /* Stop playback */
+ if( ( p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE ) ) )
{
- vlc_object_detach( p_playlist );
+ playlist_Stop( p_playlist );
vlc_object_release( p_playlist );
- playlist_Destroy( p_playlist );
}
+ /* FIXME - Wait here until all vouts are terminated because
+ libvlc's VLC_Stop destroys interfaces before vouts, which isn't
+ good on OS X. We definitly need a cleaner way to handle this,
+ but this may hopefully be good enough for now.
+ -- titer 2003/11/22 */
+ while( ( p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
+ FIND_ANYWHERE ) ) )
+ {
+ vlc_object_release( p_vout );
+ msleep( 100000 );
+ }
+ msleep( 500000 );
+
+ if( o_img_pause_pressed != nil )
+ {
+ [o_img_pause_pressed release];
+ o_img_pause_pressed = nil;
+ }
+
+ if( o_img_pause_pressed != nil )
+ {
+ [o_img_pause_pressed release];
+ o_img_pause_pressed = nil;
+ }
+
if( o_img_pause != nil )
{
[o_img_pause release];
o_msg_lock = nil;
}
+ [NSApp terminate: nil];
[NSApp stop: nil];
/* write cached user defaults to disk */
- (IBAction)closeError:(id)sender
{
+ vlc_value_t val;
+ intf_thread_t * p_intf = [NSApp getIntf];
+
+ if( [o_err_ckbk_surpress state] == NSOnState )
+ {
+ val.i_int = -1;
+ var_Set( p_intf->p_vlc, "verbose", val );
+ }
[o_err_msg setString: @""];
[o_error performClose: self];
}
- (IBAction)openWebsite:(id)sender
{
- NSURL * o_url = [NSURL URLWithString: @"http://www.videolan.org"];
+ NSURL * o_url = [NSURL URLWithString: @"http://www.videolan.org/"];
[[NSWorkspace sharedWorkspace] openURL: o_url];
}
projects / vlc / blobdiff