/*****************************************************************************
* controls.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
+ * Copyright (C) 2002-2005 VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
- (IBAction)play:(id)sender
{
vlc_value_t val;
- playlist_t * p_playlist;
- intf_thread_t * p_intf = [NSApp getIntf];
- input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
-
- val.i_int = PLAYING_S;
- if( p_input )
- {
- var_Get( p_input, "state", &val );
- }
- if( p_input && val.i_int != PAUSE_S )
- {
- vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Pause" ) );
- val.i_int = PAUSE_S;
- var_Set( p_input, "state", val );
- }
- else
- {
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
- if( p_playlist )
+ if( p_playlist )
+ {
+ vlc_mutex_lock( &p_playlist->object_lock );
+ if( p_playlist->i_size <= 0 )
{
- vlc_mutex_lock( &p_playlist->object_lock );
- if( p_playlist->i_size )
- {
- vlc_mutex_unlock( &p_playlist->object_lock );
- vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Play" ) );
- playlist_Play( p_playlist );
- vlc_object_release( p_playlist );
- }
- else
- {
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
- [o_open openFileGeneric: nil];
- }
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ vlc_object_release( p_playlist );
+ [o_main intfOpenFileGeneric: (id)sender];
}
+ else
+ {
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ vlc_object_release( p_playlist );
+ }
+
}
- if( p_input ) vlc_object_release( p_input );
+ val.i_int = config_GetInt( p_intf, "key-play-pause" );
+ var_Set( p_intf->p_vlc, "key-pressed", val );
}
- (IBAction)stop:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist != NULL )
- {
- vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Stop" ) );
- playlist_Stop( p_playlist );
- vlc_object_release( p_playlist );
- }
+ vlc_value_t val;
+ intf_thread_t * p_intf = VLCIntf;
+ val.i_int = config_GetInt( p_intf, "key-stop" );
+ var_Set( p_intf->p_vlc, "key-pressed", val );
}
- (IBAction)faster:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
- input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
- if( p_input != NULL )
- {
- vlc_value_t val; val.b_bool = VLC_TRUE;
-
- var_Set( p_input, "rate-faster", val );
- vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Faster" ) );
- vlc_object_release( p_input );
- }
+ vlc_value_t val;
+ intf_thread_t * p_intf = VLCIntf;
+ val.i_int = config_GetInt( p_intf, "key-faster" );
+ var_Set( p_intf->p_vlc, "key-pressed", val );
}
- (IBAction)slower:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
- input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
- if( p_input != NULL )
- {
- vlc_value_t val; val.b_bool = VLC_TRUE;
-
- var_Set( p_input, "rate-slower", val );
- vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Slower" ) );
- vlc_object_release( p_input );
- }
+ vlc_value_t val;
+ intf_thread_t * p_intf = VLCIntf;
+ val.i_int = config_GetInt( p_intf, "key-slower" );
+ var_Set( p_intf->p_vlc, "key-pressed", val );
}
- (IBAction)prev:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
- {
- playlist_Prev( p_playlist );
- vlc_object_release( p_playlist );
- vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Previous" ) );
- }
+ vlc_value_t val;
+ intf_thread_t * p_intf = VLCIntf;
+ val.i_int = config_GetInt( p_intf, "key-prev" );
+ var_Set( p_intf->p_vlc, "key-pressed", val );
}
- (IBAction)next:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
- {
- playlist_Next( p_playlist );
- vlc_object_release( p_playlist );
- vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Next" ) );
- }
+ vlc_value_t val;
+ intf_thread_t * p_intf = VLCIntf;
+ val.i_int = config_GetInt( p_intf, "key-next" );
+ var_Set( p_intf->p_vlc, "key-pressed", val );
}
- (IBAction)random:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
vlc_value_t val;
+ intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist == NULL )
- (IBAction)repeat:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
vlc_value_t val;
+ intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist == NULL )
- (IBAction)loop:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
vlc_value_t val;
+ intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist == NULL )
- (IBAction)forward:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
- input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
- if( p_input != NULL )
- {
- vlc_value_t time;
- time.i_time = 10 * 1000000;
- var_Set( p_input, "time-offset", time );
- vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Jump +10 Seconds" ) );
- vlc_object_release( p_input );
- }
+ vlc_value_t val;
+ intf_thread_t * p_intf = VLCIntf;
+ val.i_int = config_GetInt( p_intf, "key-jump+10sec" );
+ var_Set( p_intf->p_vlc, "key-pressed", val );
}
- (IBAction)backward:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
- input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
- if( p_input != NULL )
- {
- vlc_value_t time;
- time.i_time = -10 * 1000000;
- var_Set( p_input, "time-offset", time );
- vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Jump -10 Seconds" ) );
- vlc_object_release( p_input );
- }
+ vlc_value_t val;
+ intf_thread_t * p_intf = VLCIntf;
+ val.i_int = config_GetInt( p_intf, "key-jump-10sec" );
+ var_Set( p_intf->p_vlc, "key-pressed", val );
}
- (IBAction)volumeUp:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
-
- if( p_intf->p_sys->b_mute )
- {
- [self mute: nil];
- }
-
- aout_VolumeUp( p_intf, 1, NULL );
-
+ vlc_value_t val;
+ intf_thread_t * p_intf = VLCIntf;
+ val.i_int = config_GetInt( p_intf, "key-vol-up" );
+ var_Set( p_intf->p_vlc, "key-pressed", val );
[self updateVolumeSlider];
}
- (IBAction)volumeDown:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
-
- if( p_intf->p_sys->b_mute )
- {
- [self mute: nil];
- }
-
- aout_VolumeDown( p_intf, 1, NULL );
-
+ vlc_value_t val;
+ intf_thread_t * p_intf = VLCIntf;
+ val.i_int = config_GetInt( p_intf, "key-vol-down" );
+ var_Set( p_intf->p_vlc, "key-pressed", val );
[self updateVolumeSlider];
}
- (IBAction)mute:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
- audio_volume_t i_volume;
-
- aout_VolumeMute( p_intf, &i_volume );
- p_intf->p_sys->b_mute = ( i_volume == 0 );
-
+ vlc_value_t val;
+ intf_thread_t * p_intf = VLCIntf;
+ val.i_int = config_GetInt( p_intf, "key-vol-mute" );
+ var_Set( p_intf->p_vlc, "key-pressed", val );
[self updateVolumeSlider];
}
- (IBAction)volumeSliderUpdated:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
+ intf_thread_t * p_intf = VLCIntf;
audio_volume_t i_volume = (audio_volume_t)[sender intValue];
-
aout_VolumeSet( p_intf, i_volume * AOUT_VOLUME_STEP );
+ [self updateVolumeSlider];
}
- (void)updateVolumeSlider
{
- intf_thread_t * p_intf = [NSApp getIntf];
+ NSString * o_text;
+ char * psz_text;
+ intf_thread_t * p_intf = VLCIntf;
audio_volume_t i_volume;
aout_VolumeGet( p_intf, &i_volume );
-
+ psz_text = malloc( 32 * sizeof( char ) );
+/*FIXME: do we really need to work with a char * before NSString ? */
+ if( psz_text )
+ {
+ sprintf( psz_text, "Volume: %d", i_volume * 200 / AOUT_VOLUME_MAX );
+ o_text = [[NSString alloc] initWithCString:psz_text];
+ [o_main setScrollField:o_text stopAfter:1000000];
+ free( psz_text );
+ }
[o_volumeslider setFloatValue: (float)(i_volume / AOUT_VOLUME_STEP)];
-
- vout_OSDMessage( p_intf, DEFAULT_CHAN, "Vol %d%%",
- i_volume*100/AOUT_VOLUME_MAX );
}
- (IBAction)windowAction:(id)sender
NSString *o_title = [sender title];
NSArray *o_windows = [NSApp orderedWindows];
NSEnumerator *o_enumerator = [o_windows objectEnumerator];
- vout_thread_t *p_vout = vlc_object_find( [NSApp getIntf], VLC_OBJECT_VOUT,
+ vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT,
+ FIND_ANYWHERE );
+
+ playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_vout != NULL )
if( ![o_window isZoomed] )
[o_window performZoom:self];
}
+ else if( [o_title isEqualToString: _NS("Snapshot") ] )
+ {
+ [o_window snapshot];
+ }
else
{
- [o_window toggleFullscreen];
+ vlc_value_t val;
+ var_Get( p_vout, "fullscreen", &val );
+ var_Set( p_vout, "fullscreen", (vlc_value_t)!val.b_bool );
}
break;
}
}
vlc_object_release( (vlc_object_t *)p_vout );
+ if (p_playlist) vlc_object_release(p_playlist);
+ }
+
+ else if ( p_playlist != NULL )
+ {
+ if (! ([o_title isEqualToString: _NS("Half Size") ] ||
+ [o_title isEqualToString: _NS("Normal Size") ] ||
+ [o_title isEqualToString: _NS("Double Size") ] ||
+ [o_title isEqualToString: _NS("Float on Top") ] ||
+ [o_title isEqualToString: _NS("Fit to Screen") ] ))
+ {
+ vlc_value_t val;
+ var_Get( p_playlist, "fullscreen", &val );
+ var_Set( p_playlist, "fullscreen", (vlc_value_t)!val.b_bool );
+ }
+ vlc_object_release( (vlc_object_t *)p_playlist );
}
+
}
- (void)setupVarMenuItem:(NSMenuItem *)o_mi
/* Get the descriptive name of the variable */
var_Change( p_object, psz_variable, VLC_VAR_GETTEXT, &text, NULL );
- [o_mi setTitle: [NSApp localizedString: text.psz_string ?
+ [o_mi setTitle: [[VLCMain sharedInstance] localizedString: text.psz_string ?
text.psz_string : strdup( psz_variable ) ]];
var_Get( p_object, psz_variable, &val );
another_val.psz_string =
strdup(val_list.p_list->p_values[i].psz_string);
- o_title = [NSApp localizedString: text_list.p_list->p_values[i].psz_string ?
+ o_title = [[VLCMain sharedInstance] localizedString: text_list.p_list->p_values[i].psz_string ?
text_list.p_list->p_values[i].psz_string : val_list.p_list->p_values[i].psz_string ];
o_lmi = [o_menu addItemWithTitle: o_title action: pf_callback keyEquivalent: @""];
case VLC_VAR_INTEGER:
o_title = text_list.p_list->p_values[i].psz_string ?
- [NSApp localizedString: strdup( text_list.p_list->p_values[i].psz_string )] :
+ [[VLCMain sharedInstance] localizedString: strdup( text_list.p_list->p_values[i].psz_string )] :
[NSString stringWithFormat: @"%d",
val_list.p_list->p_values[i].i_int];
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
VLCMenuExt *o_data = (VLCMenuExt *)_o_data;
- vlc_thread_set_priority( [NSApp getIntf] , VLC_THREAD_PRIORITY_LOW );
+ vlc_thread_set_priority( VLCIntf , VLC_THREAD_PRIORITY_LOW );
- p_object = (vlc_object_t *)vlc_object_get( [NSApp getIntf],
+ p_object = (vlc_object_t *)vlc_object_get( VLCIntf,
[o_data objectID] );
if( p_object != NULL )
{
BOOL bEnabled = TRUE;
vlc_value_t val;
- intf_thread_t * p_intf = [NSApp getIntf];
+ intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
{
if( p_playlist != NULL && p_input != NULL )
{
- vlc_mutex_lock( &p_input->stream.stream_lock );
- bEnabled = p_input->stream.b_pace_control;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+ bEnabled = p_input->input.b_can_pace_control;
}
else
{
else
{
bEnabled = p_playlist->i_size > 1;
-
- if( p_input != NULL )
- {
- vlc_mutex_lock( &p_input->stream.stream_lock );
- bEnabled |= p_input->stream.i_area_nb > 1;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- }
}
}
else if( [[o_mi title] isEqualToString: _NS("Random")] )
else if( [[o_mi title] isEqualToString: _NS("Step Forward")] ||
[[o_mi title] isEqualToString: _NS("Step Backward")] )
{
+ bEnabled = FALSE;
if( p_playlist != NULL && p_input != NULL )
{
- vlc_mutex_lock( &p_input->stream.stream_lock );
- bEnabled = p_input->stream.b_seekable;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- }
- else
- {
- bEnabled = FALSE;
+ var_Get( p_input, "seekable", &val);
+ if( val.b_bool )
+ {
+ bEnabled = TRUE;
+ }
}
}
else if( [[o_mi title] isEqualToString: _NS("Mute")] )
{
[o_mi setState: p_intf->p_sys->b_mute ? NSOnState : NSOffState];
}
- else if( [[o_mi title] isEqualToString: _NS("Fullscreen")] ||
- [[o_mi title] isEqualToString: _NS("Half Size")] ||
+ else if( [[o_mi title] isEqualToString: _NS("Half Size")] ||
[[o_mi title] isEqualToString: _NS("Normal Size")] ||
[[o_mi title] isEqualToString: _NS("Double Size")] ||
[[o_mi title] isEqualToString: _NS("Fit to Screen")] ||
+ [[o_mi title] isEqualToString: _NS("Snapshot")] ||
[[o_mi title] isEqualToString: _NS("Float on Top")] )
{
id o_window;
vlc_object_release( (vlc_object_t *)p_vout );
}
}
+ else if( [[o_mi title] isEqualToString: _NS("Fullscreen")])
+ {
+ if (p_playlist)
+ {
+ var_Get(p_playlist, "fullscreen", &val );
+ [o_mi setState: val.b_bool];
+ bEnabled = TRUE;
+ }
+ else
+ {
+ bEnabled = FALSE;
+ }
+ }
+
if( p_playlist != NULL )
{