/*****************************************************************************
- * intf.m: MacOS X interface plugin
+ * intf.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
- * $Id: intf.m,v 1.101 2003/11/15 22:42:16 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
[[VLCApplication sharedApplication] autorelease];
[NSApp setIntf: p_intf];
+
[NSBundle loadNibNamed: @"MainMenu" owner: NSApp];
return( 0 );
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;
}
- (void)awakeFromNib
{
- unsigned int i_key;
+ unsigned int i_key = 0;
intf_thread_t * p_intf = [NSApp getIntf];
+ vlc_value_t val;
[self initStrings];
[o_window setExcludedFromWindowsMenu: TRUE];
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, "fullscreen", VLC_VAR_BOOL );
+ var_Change (p_intf, "fullscreen", VLC_VAR_INHERITVALUE, &val, NULL );
+ [o_btn_fullscreen setState: val.b_bool];
+
+ var_Create(p_intf,"intf-change",VLC_VAR_BOOL );
+
[self setSubmenusEnabled: FALSE];
[self manageVolumeSlider];
- (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_rewind setToolTip: _NS("Rewind")];
[o_btn_play setToolTip: _NS("Play")];
/* 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_hide setTitle: _NS("Hide VLC")];
[o_mi_hide_others setTitle: _NS("Hide Others")];
[o_mi_show_all setTitle: _NS("Show All")];
[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_fwd setTitle: _NS("Step Forward")];
- [o_mi_bwd setTitle: _NS("Step Backward")];
+ [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("Forward 10 Seconds")];
+ [o_mi_bwd setTitle: _NS("Backward 10 Seconds")];
+ [o_mi_fwd1m setTitle: _NS("Forward 1 Minute")];
+ [o_mi_bwd1m setTitle: _NS("Backward 1 Minute")];
+ [o_mi_fwd5m setTitle: _NS("Forward 5 Minutes")];
+ [o_mi_bwd5m setTitle: _NS("Backward 5 Minutes")];
+
[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_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("Surpress further errors")];
[o_info_window setTitle: _NS("Info")];
}
[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 );
}
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]->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] ) )
{
/* 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 */
}
[o_btn_stop setEnabled: b_input];
- [o_btn_ff setEnabled: b_control];
- [o_btn_rewind 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;
+ if (var_Change (p_intf, "fullscreen", VLC_VAR_INHERITVALUE, &val, NULL)>=0 && val.b_bool )
+ {
+ [o_btn_fullscreen setState:VLC_TRUE];
+ }
+ else
+ {
+ [o_btn_fullscreen setState:VLC_FALSE];
+ }
+ 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;
{
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,
{
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];
- (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];
}