/*****************************************************************************
* controls.m: MacOS X interface plugin
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: controls.m,v 1.22 2003/02/08 17:26:00 massiot Exp $
+ * Copyright (C) 2002-2003 VideoLAN
+ * $Id: controls.m,v 1.49 2003/09/20 19:37:53 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
#include "intf.h"
#include "vout.h"
-
-/*****************************************************************************
- * VLCControls interface
- *****************************************************************************/
-@interface VLCControls : NSObject
-{
- IBOutlet id o_open;
- IBOutlet id o_main;
-
- IBOutlet id o_volumeslider;
-}
-
-- (IBAction)play:(id)sender;
-- (IBAction)stop:(id)sender;
-- (IBAction)faster:(id)sender;
-- (IBAction)slower:(id)sender;
-
-- (IBAction)prev:(id)sender;
-- (IBAction)next:(id)sender;
-- (IBAction)loop:(id)sender;
-
-- (IBAction)volumeUp:(id)sender;
-- (IBAction)volumeDown:(id)sender;
-- (IBAction)mute:(id)sender;
-- (IBAction)volumeSliderUpdated:(id)sender;
-- (void)updateVolumeSlider;
-
-- (IBAction)halfWindow:(id)sender;
-- (IBAction)normalWindow:(id)sender;
-- (IBAction)doubleWindow:(id)sender;
-- (IBAction)fullscreen:(id)sender;
-- (IBAction)deinterlace:(id)sender;
-
-- (IBAction)toggleProgram:(id)sender;
-- (IBAction)toggleTitle:(id)sender;
-- (IBAction)toggleChapter:(id)sender;
-- (IBAction)toggleLanguage:(id)sender;
-- (IBAction)toggleVar:(id)sender;
-
-@end
+#include "open.h"
+#include "controls.h"
/*****************************************************************************
* VLCControls implementation
else
{
vlc_object_release( p_playlist );
- [o_open openFile: nil];
+ [o_open openFileGeneric: nil];
}
}
}
- (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 )
+ if( p_playlist != NULL )
{
- return;
+ playlist_Stop( p_playlist );
+ vlc_object_release( p_playlist );
}
-
- playlist_Stop( p_playlist );
- vlc_object_release( p_playlist );
}
- (IBAction)faster:(id)sender
{
intf_thread_t * p_intf = [NSApp getIntf];
-
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
FIND_ANYWHERE );
- if( p_playlist == NULL )
- {
- return;
- }
-
- vlc_mutex_lock( &p_playlist->object_lock );
- if( p_playlist->p_input != NULL )
+ if( p_input != NULL )
{
- input_SetStatus( p_playlist->p_input, INPUT_STATUS_FASTER );
- }
- vlc_mutex_unlock( &p_playlist->object_lock );
+ vlc_value_t val; val.b_bool = VLC_TRUE;
- vlc_object_release( p_playlist );
+ var_Set( p_input, "rate-faster", val );
+ vlc_object_release( p_input );
+ }
}
- (IBAction)slower:(id)sender
{
intf_thread_t * p_intf = [NSApp getIntf];
-
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
FIND_ANYWHERE );
- if( p_playlist == NULL )
+ if( p_input != NULL )
{
- return;
- }
+ vlc_value_t val; val.b_bool = VLC_TRUE;
- vlc_mutex_lock( &p_playlist->object_lock );
- if( p_playlist->p_input != NULL )
- {
- input_SetStatus( p_playlist->p_input, INPUT_STATUS_SLOWER );
+ var_Set( p_input, "rate-slower", val );
+ vlc_object_release( p_input );
}
- vlc_mutex_unlock( &p_playlist->object_lock );
-
- vlc_object_release( p_playlist );
}
- (IBAction)prev:(id)sender
{
+ vlc_value_t val;
intf_thread_t * p_intf = [NSApp getIntf];
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
}
vlc_mutex_lock( &p_playlist->p_input->stream.stream_lock );
+ val.b_bool = VLC_TRUE;
#define p_area p_playlist->p_input->stream.p_selected_area
-
- if( p_area->i_part_nb > 1 && p_area->i_part > 1 )
+ if( p_area->i_part > 0 && p_area->i_part_nb > 1)
{
- p_area->i_part--;
-
vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
- input_ChangeArea( p_playlist->p_input, p_area );
+ var_Set( p_playlist->p_input, "prev-chapter", val );
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ }
+ else if( p_area->i_id > 1 )
+ {
+ vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
+ var_Set( p_playlist->p_input, "prev-title", val );
vlc_mutex_unlock( &p_playlist->object_lock );
-
- p_intf->p_sys->b_chapter_update = VLC_TRUE;
}
else
{
vlc_mutex_unlock( &p_playlist->object_lock );
playlist_Prev( p_playlist );
}
-
#undef p_area
vlc_object_release( p_playlist );
- (IBAction)next:(id)sender
{
+ vlc_value_t val;
intf_thread_t * p_intf = [NSApp getIntf];
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
{
return;
}
-
+
vlc_mutex_lock( &p_playlist->object_lock );
if( p_playlist->p_input == NULL )
}
vlc_mutex_lock( &p_playlist->p_input->stream.stream_lock );
+ val.b_bool = VLC_TRUE;
#define p_area p_playlist->p_input->stream.p_selected_area
-
- if( p_area->i_part_nb > 1 && p_area->i_part + 1 < p_area->i_part_nb )
+ if( p_area->i_part < p_area->i_part_nb - 1 && p_area->i_part_nb > 1 )
{
- p_area->i_part++;
-
vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
- input_ChangeArea( p_playlist->p_input, p_area );
+ var_Set( p_playlist->p_input, "next-chapter", val );
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ }
+ else if( p_area->i_id < p_playlist->p_input->stream.i_area_nb && p_playlist->p_input->stream.i_area_nb > 1 )
+ {
+ vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
+ var_Set( p_playlist->p_input, "next-title", val );
vlc_mutex_unlock( &p_playlist->object_lock );
-
- p_intf->p_sys->b_chapter_update = VLC_TRUE;
}
else
{
vlc_mutex_unlock( &p_playlist->object_lock );
playlist_Next( p_playlist );
}
-
#undef p_area
vlc_object_release( p_playlist );
}
-- (IBAction)loop:(id)sender
+- (IBAction)random:(id)sender
{
intf_thread_t * p_intf = [NSApp getIntf];
-
+ vlc_value_t val;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist == NULL )
return;
}
- config_PutInt( p_playlist, "loop",
- !config_GetInt( p_playlist, "loop" ) );
+ var_Get( p_playlist, "random", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "random", val );
vlc_object_release( p_playlist );
}
-- (IBAction)volumeUp:(id)sender
+- (IBAction)repeat:(id)sender
{
intf_thread_t * p_intf = [NSApp getIntf];
-
- aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
- if( p_aout != NULL )
+ vlc_value_t val;
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist == NULL )
{
- if( p_intf->p_sys->b_mute )
- {
- [self mute: nil];
- }
-
- aout_VolumeUp( p_aout, 1, NULL );
- vlc_object_release( (vlc_object_t *)p_aout );
+ return;
}
- [self updateVolumeSlider];
+ var_Get( p_playlist, "repeat", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "repeat", val );
+
+ vlc_object_release( p_playlist );
}
-- (IBAction)volumeDown:(id)sender
+- (IBAction)loop:(id)sender
{
intf_thread_t * p_intf = [NSApp getIntf];
-
- aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
- if( p_aout != NULL )
+ vlc_value_t val;
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist == NULL )
{
- if( p_intf->p_sys->b_mute )
- {
- [self mute: nil];
- }
-
- aout_VolumeDown( p_aout, 1, NULL );
- vlc_object_release( (vlc_object_t *)p_aout );
+ return;
}
- [self updateVolumeSlider];
+ var_Get( p_playlist, "loop", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "loop", val );
+
+ vlc_object_release( p_playlist );
}
-- (IBAction)mute:(id)sender
+- (IBAction)forward:(id)sender
{
intf_thread_t * p_intf = [NSApp getIntf];
-
- aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
-
- if ( p_aout != NULL )
+ input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
+ FIND_ANYWHERE );
+ if( p_input != NULL )
{
- audio_volume_t i_volume;
-
- aout_VolumeMute( p_aout, &i_volume );
- vlc_object_release( (vlc_object_t *)p_aout );
-
- p_intf->p_sys->b_mute = ( i_volume == 0 );
+ vlc_value_t time;
+ time.i_time = 5 * 1000000;
+ var_Set( p_input, "time-offset", time );
+ vlc_object_release( p_input );
}
-
- [self updateVolumeSlider];
}
-- (IBAction)volumeSliderUpdated:(id)sender
+- (IBAction)backward:(id)sender
{
intf_thread_t * p_intf = [NSApp getIntf];
-
- aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
- if( p_aout != NULL )
+ input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
+ FIND_ANYWHERE );
+ if( p_input != NULL )
{
- audio_volume_t i_volume;
-
- i_volume = (audio_volume_t)[sender intValue];
-
- aout_VolumeSet( p_aout, i_volume * AOUT_VOLUME_STEP );
- vlc_object_release( (vlc_object_t *)p_aout );
+ vlc_value_t time;
+ time.i_time = -5 * 1000000;
+ var_Set( p_input, "time-offset", time );
+ vlc_object_release( p_input );
}
}
-- (void)updateVolumeSlider
+- (IBAction)volumeUp:(id)sender
{
intf_thread_t * p_intf = [NSApp getIntf];
- aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
-
- if ( p_aout != NULL )
+ if( p_intf->p_sys->b_mute )
{
- audio_volume_t i_volume;
+ [self mute: nil];
+ }
- aout_VolumeGet( p_aout, &i_volume );
- vlc_object_release( (vlc_object_t *)p_aout );
+ aout_VolumeUp( p_intf, 1, NULL );
- [o_volumeslider setFloatValue: (float)(i_volume / AOUT_VOLUME_STEP)];
- }
+ [self updateVolumeSlider];
}
-- (IBAction)halfWindow:(id)sender
+- (IBAction)volumeDown:(id)sender
{
- id o_window = [NSApp keyWindow];
- NSArray *o_windows = [NSApp windows];
- NSEnumerator *o_enumerator = [o_windows objectEnumerator];
-
- while ((o_window = [o_enumerator nextObject]))
+ intf_thread_t * p_intf = [NSApp getIntf];
+
+ if( p_intf->p_sys->b_mute )
{
- if( [[o_window className] isEqualToString: @"VLCWindow"] )
- {
- [o_window scaleWindowWithFactor: 0.5];
- }
+ [self mute: nil];
}
+
+ aout_VolumeDown( p_intf, 1, NULL );
+
+ [self updateVolumeSlider];
}
-- (IBAction)normalWindow:(id)sender
+- (IBAction)mute:(id)sender
{
- id o_window = [NSApp keyWindow];
- NSArray *o_windows = [NSApp windows];
- NSEnumerator *o_enumerator = [o_windows objectEnumerator];
-
- while ((o_window = [o_enumerator nextObject]))
- {
- if( [[o_window className] isEqualToString: @"VLCWindow"] )
- {
- [o_window scaleWindowWithFactor: 1];
- }
- }
+ 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 );
+
+ [self updateVolumeSlider];
}
-- (IBAction)doubleWindow:(id)sender
+- (IBAction)volumeSliderUpdated:(id)sender
{
- id o_window = [NSApp keyWindow];
- NSArray *o_windows = [NSApp windows];
- NSEnumerator *o_enumerator = [o_windows objectEnumerator];
-
- while ((o_window = [o_enumerator nextObject]))
- {
- if( [[o_window className] isEqualToString: @"VLCWindow"] )
- {
- [o_window scaleWindowWithFactor: 2];
- }
- }
+ intf_thread_t * p_intf = [NSApp getIntf];
+ audio_volume_t i_volume = (audio_volume_t)[sender intValue];
+
+ aout_VolumeSet( p_intf, i_volume * AOUT_VOLUME_STEP );
}
+- (void)updateVolumeSlider
+{
+ intf_thread_t * p_intf = [NSApp getIntf];
+ audio_volume_t i_volume;
+
+ aout_VolumeGet( p_intf, &i_volume );
-- (IBAction)fullscreen:(id)sender
+ [o_volumeslider setFloatValue: (float)(i_volume / AOUT_VOLUME_STEP)];
+}
+
+- (IBAction)windowAction:(id)sender
{
id o_window = [NSApp keyWindow];
+ NSString *o_title = [sender title];
NSArray *o_windows = [NSApp windows];
NSEnumerator *o_enumerator = [o_windows objectEnumerator];
-
- while ((o_window = [o_enumerator nextObject]))
+ vout_thread_t *p_vout = vlc_object_find( [NSApp getIntf], VLC_OBJECT_VOUT,
+ FIND_ANYWHERE );
+
+ if( p_vout != NULL )
{
- if( [[o_window className] isEqualToString: @"VLCWindow"] )
+ while ((o_window = [o_enumerator nextObject]))
{
- [o_window toggleFullscreen];
+ if( [[o_window className] isEqualToString: @"VLCWindow"] )
+ {
+ if( [o_title isEqualToString: _NS("Fullscreen") ] )
+ [o_window toggleFullscreen];
+ else if( [o_title isEqualToString: _NS("Half Size") ] )
+ [o_window scaleWindowWithFactor: 0.5];
+ else if( [o_title isEqualToString: _NS("Normal Size") ] )
+ [o_window scaleWindowWithFactor: 1.0];
+ else if( [o_title isEqualToString: _NS("Double Size") ] )
+ [o_window scaleWindowWithFactor: 2.0];
+ else if( [o_title isEqualToString: _NS("Float On Top") ] )
+ [o_window toggleFloatOnTop];
+ else if( [o_title isEqualToString: _NS("Fit To Screen") ] )
+ {
+ if( ![o_window isZoomed] )
+ [o_window performZoom:self];
+ }
+ }
}
+ vlc_object_release( (vlc_object_t *)p_vout );
}
}
-- (IBAction)deinterlace:(id)sender
+- (void)setupVarMenuItem:(NSMenuItem *)o_mi
+ target:(vlc_object_t *)p_object
+ var:(const char *)psz_variable
+ selector:(SEL)pf_callback
{
-
-}
-
-- (IBAction)toggleProgram:(id)sender
-{
- NSMenuItem * o_mi = (NSMenuItem *)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 )
- {
+ vlc_value_t val, text;
+ int i_type = var_Type( p_object, psz_variable );
+
+ switch( i_type & VLC_VAR_TYPE )
+ {
+ case VLC_VAR_VOID:
+ case VLC_VAR_BOOL:
+ case VLC_VAR_VARIABLE:
+ case VLC_VAR_STRING:
+ case VLC_VAR_INTEGER:
+ break;
+ default:
+ /* Variable doesn't exist or isn't handled */
return;
}
-
- vlc_mutex_lock( &p_playlist->object_lock );
-
- if( p_playlist->p_input == NULL )
+
+ /* Make sure we want to display the variable */
+ if( i_type & VLC_VAR_HASCHOICE )
{
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
- return;
+ var_Change( p_object, psz_variable, VLC_VAR_CHOICESCOUNT, &val, NULL );
+ if( val.i_int == 0 ) return;
+ if( (i_type & VLC_VAR_TYPE) != VLC_VAR_VARIABLE && val.i_int == 1 )
+ return;
}
+
+ /* 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 ?
+ text.psz_string : strdup( psz_variable ) ]];
- if( [o_mi state] == NSOffState )
+ var_Get( p_object, psz_variable, &val );
+ if( i_type & VLC_VAR_HASCHOICE )
{
- u16 i_program_id = [o_mi tag];
+ NSMenu *o_menu = [o_mi submenu];
- input_ChangeProgram( p_playlist->p_input, i_program_id );
- input_SetStatus( p_playlist->p_input, INPUT_STATUS_PLAY );
- }
-
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
-}
-
-- (IBAction)toggleTitle:(id)sender
-{
- NSMenuItem * o_mi = (NSMenuItem *)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 )
- {
+ [self setupVarMenu: o_menu forMenuItem: o_mi target:p_object
+ var:psz_variable selector:pf_callback];
+
+ if( text.psz_string ) free( text.psz_string );
return;
}
- vlc_mutex_lock( &p_playlist->object_lock );
-
- if( p_playlist->p_input == NULL )
+ VLCMenuExt *o_data;
+ switch( i_type & VLC_VAR_TYPE )
{
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
- return;
- }
+ case VLC_VAR_VOID:
+ o_data = [[VLCMenuExt alloc] initWithVar: psz_variable Object: p_object->i_object_id
+ Value: val ofType: i_type];
+ [o_mi setRepresentedObject: [NSValue valueWithPointer:[o_data retain]]];
+ break;
- if( [o_mi state] == NSOffState )
- {
- int i_title = [o_mi tag];
+ case VLC_VAR_BOOL:
+ o_data = [[VLCMenuExt alloc] initWithVar: psz_variable Object: p_object->i_object_id
+ Value: val ofType: i_type];
+ [o_mi setRepresentedObject: [NSValue valueWithPointer:[o_data retain]]];
+ [o_mi setState: val.b_bool ? TRUE : FALSE ];
+ break;
-#define p_input p_playlist->p_input
- input_ChangeArea( p_input, p_input->stream.pp_areas[i_title] );
- input_SetStatus( p_input, INPUT_STATUS_PLAY );
-#undef p_input
+ default:
+ if( text.psz_string ) free( text.psz_string );
+ return;
}
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
+ if( (i_type & VLC_VAR_TYPE) == VLC_VAR_STRING ) free( val.psz_string );
+ if( text.psz_string ) free( text.psz_string );
}
-- (IBAction)toggleChapter:(id)sender
+
+- (void)setupVarMenu:(NSMenu *)o_menu
+ forMenuItem: (NSMenuItem *)o_parent
+ target:(vlc_object_t *)p_object
+ var:(const char *)psz_variable
+ selector:(SEL)pf_callback
{
- NSMenuItem * o_mi = (NSMenuItem *)sender;
- intf_thread_t * p_intf = [NSApp getIntf];
+ vlc_value_t val, val_list, text_list;
+ int i_type, i, i_nb_items;
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist == NULL )
+ /* remove previous items */
+ i_nb_items = [o_menu numberOfItems];
+ for( i = 0; i < i_nb_items; i++ )
{
- return;
+ [o_menu removeItemAtIndex: 0];
}
- vlc_mutex_lock( &p_playlist->object_lock );
+ /* Check the type of the object variable */
+ i_type = var_Type( p_object, psz_variable );
- if( p_playlist->p_input == NULL )
+ /* Make sure we want to display the variable */
+ if( i_type & VLC_VAR_HASCHOICE )
{
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
- return;
+ var_Change( p_object, psz_variable, VLC_VAR_CHOICESCOUNT, &val, NULL );
+ if( val.i_int == 0 ) return;
+ if( (i_type & VLC_VAR_TYPE) != VLC_VAR_VARIABLE && val.i_int == 1 )
+ return;
}
-
- if( [o_mi state] == NSOffState )
+ else
{
- int i_chapter = [o_mi tag];
-
-#define p_input p_playlist->p_input
- p_input->stream.p_selected_area->i_part = i_chapter;
- input_ChangeArea( p_input, p_input->stream.p_selected_area );
- input_SetStatus( p_input, INPUT_STATUS_PLAY );
-#undef p_input
+ return;
}
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
-}
-
-- (IBAction)toggleLanguage:(id)sender
-{
- NSMenuItem * o_mi = (NSMenuItem *)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 )
+ switch( i_type & VLC_VAR_TYPE )
{
+ case VLC_VAR_VOID:
+ case VLC_VAR_BOOL:
+ case VLC_VAR_VARIABLE:
+ case VLC_VAR_STRING:
+ case VLC_VAR_INTEGER:
+ break;
+ default:
+ /* Variable doesn't exist or isn't handled */
return;
}
- vlc_mutex_lock( &p_playlist->object_lock );
-
- if( p_playlist->p_input == NULL )
+ if( var_Get( p_object, psz_variable, &val ) < 0 )
{
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
return;
}
-#if 0
- /* We do not use this code, because you need to start stop .avi for
- * it to work, so not very useful now --hartman */
- if ( [o_mi state] == NSOffState && [o_mi tag] == 2000 )
+ if( var_Change( p_object, psz_variable, VLC_VAR_GETLIST,
+ &val_list, &text_list ) < 0 )
{
- NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
-
- [o_open_panel setAllowsMultipleSelection: NO];
- [o_open_panel setTitle: _NS("Open subtitlefile")];
- [o_open_panel setPrompt: _NS("Open")];
-
- if( [o_open_panel runModalForDirectory: nil
- file: nil types: nil] == NSOKButton )
- {
- NSString *o_filename = [[o_open_panel filenames] objectAtIndex: 0];
- config_PutPsz( p_intf, "sub-file", strdup( [o_filename cString] ));
- }
+ if( (i_type & VLC_VAR_TYPE) == VLC_VAR_STRING ) free( val.psz_string );
+ return;
}
-#endif
-#define p_input p_playlist->p_input
+ /* make (un)sensitive */
+ [o_parent setEnabled: ( val_list.p_list->i_count > 1 )];
- if( !p_intf->p_sys->b_audio_update )
+ for( i = 0; i < val_list.p_list->i_count; i++ )
{
- NSValue * o_value = [o_mi representedObject];
- es_descriptor_t * p_es = [o_value pointerValue];
+ vlc_value_t another_val;
+ NSMenuItem * o_lmi;
+ NSString *o_title = @"";
+ VLCMenuExt *o_data;
- if( [o_mi state] == NSOnState )
+ switch( i_type & VLC_VAR_TYPE )
{
- /* we just have one ES to disable */
- input_ToggleES( p_input, p_es, 0 );
- }
- else
- {
- unsigned int i;
- int i_cat = [o_mi tag];
-
- vlc_mutex_lock( &p_input->stream.stream_lock );
-
-#define ES p_input->stream.pp_selected_es[i]
-
- /* unselect the selected ES in the same class */
- for( i = 0; i < p_input->stream.i_selected_es_number; i++ )
- {
- if( ES->i_cat == i_cat )
- {
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- input_ToggleES( p_input, ES, 0 );
- vlc_mutex_lock( &p_input->stream.stream_lock );
- break;
- }
- }
-
-#undef ES
-
- vlc_mutex_unlock( &p_input->stream.stream_lock );
-
- input_ToggleES( p_input, p_es, 1 );
+ case VLC_VAR_VARIABLE:
+
+ /* This is causing crashes for the moment.
+ o_title = [NSApp 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_data = [[VLCMenuExt alloc] initWithVar: strdup(psz_variable) Object: p_object->i_object_id
+ Value: val ofType: i_type];
+ [o_lmi setRepresentedObject: [NSValue valueWithPointer:[o_data retain]]];
+
+ // Create a submenu
+ NSMenu *o_menu = [o_lmi submenu];
+
+ [self setupVarMenu: o_menu forMenuItem: o_lmi target:p_object
+ var:psz_variable selector:pf_callback];
+*/
+ return;
+
+ case VLC_VAR_STRING:
+ 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 ?
+ 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: @""];
+ o_data = [[VLCMenuExt alloc] initWithVar: strdup(psz_variable) Object: p_object->i_object_id
+ Value: another_val ofType: i_type];
+ [o_lmi setRepresentedObject: [NSValue valueWithPointer:[o_data retain]]];
+ [o_lmi setTarget: self];
+
+ if( !strcmp( val.psz_string, val_list.p_list->p_values[i].psz_string ) )
+ [o_lmi setState: TRUE ];
+
+ break;
+
+ 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 )] :
+ [NSString stringWithFormat: @"%d",
+ val_list.p_list->p_values[i].i_int];
+
+ o_lmi = [[o_menu addItemWithTitle: o_title action: pf_callback keyEquivalent: @""] retain ];
+ o_data = [[VLCMenuExt alloc] initWithVar: strdup(psz_variable) Object: p_object->i_object_id
+ Value: val_list.p_list->p_values[i] ofType: i_type];
+ [o_lmi setRepresentedObject: [NSValue valueWithPointer:[ o_data retain]]];
+ [o_lmi setTarget: self];
+
+ if( val_list.p_list->p_values[i].i_int == val.i_int )
+ [o_lmi setState: TRUE ];
+ break;
+
+ default:
+ break;
}
}
+
+ /* clean up everything */
+ if( (i_type & VLC_VAR_TYPE) == VLC_VAR_STRING ) free( val.psz_string );
+ var_Change( p_object, psz_variable, VLC_VAR_FREELIST, &val_list, &text_list );
+}
-#undef p_input
+- (IBAction)toggleVar:(id)sender
+{
+ NSMenuItem *o_mi = (NSMenuItem *)sender;
+ VLCMenuExt *o_data = [[o_mi representedObject] pointerValue];
+ [NSThread detachNewThreadSelector: @selector(toggleVarThread:)
+ toTarget: self withObject: o_data];
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
+ return;
}
-- (IBAction)toggleVar:(id)sender
+- (int)toggleVarThread: (id)_o_data
{
- NSMenuItem * o_mi = (NSMenuItem *)sender;
-
- if( [o_mi state] == NSOffState )
- {
- const char * psz_variable = (const char *)[o_mi tag];
- char * psz_value = [NSApp delocalizeString: [o_mi title]];
- vlc_object_t * p_object = (vlc_object_t *)
- [[o_mi representedObject] pointerValue];
- vlc_value_t val;
- /* psz_string sucks */
- val.psz_string = (char *)psz_value;
+ vlc_object_t *p_object;
+ NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+ VLCMenuExt *o_data = (VLCMenuExt *)_o_data;
- if ( var_Set( p_object, psz_variable, val ) < 0 )
- {
- msg_Warn( p_object, "cannot set variable (%s)", psz_value );
- }
+ vlc_thread_set_priority( [NSApp getIntf] , VLC_THREAD_PRIORITY_LOW );
+
+ p_object = (vlc_object_t *)vlc_object_get( [NSApp getIntf],
+ [o_data objectID] );
- free( psz_value );
+ if( p_object != NULL )
+ {
+ var_Set( p_object, strdup([o_data name]), [o_data value] );
+ vlc_object_release( p_object );
+ [o_pool release];
+ return VLC_TRUE;
}
+ [o_pool release];
+ return VLC_EGENERIC;
}
@end
- (BOOL)validateMenuItem:(NSMenuItem *)o_mi
{
BOOL bEnabled = TRUE;
- NSMenu * o_menu = [o_mi menu];
+ vlc_value_t val;
intf_thread_t * p_intf = [NSApp getIntf];
-
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_input != NULL )
{
vlc_mutex_lock( &p_input->stream.stream_lock );
- bEnabled |= p_input->stream.p_selected_area->i_part_nb > 1;
+ bEnabled |= p_input->stream.i_area_nb > 1;
vlc_mutex_unlock( &p_input->stream.stream_lock );
}
}
}
- else if( [[o_mi title] isEqualToString: _NS("Loop")] )
+ else if( [[o_mi title] isEqualToString: _NS("Shuffle")] )
{
- int i_state = config_GetInt( p_playlist, "loop" ) ?
- NSOnState : NSOffState;
-
+ int i_state;
+ var_Get( p_playlist, "random", &val );
+ i_state = val.b_bool ? NSOnState : NSOffState;
[o_mi setState: i_state];
}
- else if( [[o_mi title] isEqualToString: _NS("Volume Up")] ||
- [[o_mi title] isEqualToString: _NS("Volume Down")] )
+ else if( [[o_mi title] isEqualToString: _NS("Repeat Item")] )
{
- aout_instance_t * p_aout;
-
- p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
- if( p_aout != NULL )
+ int i_state;
+ var_Get( p_playlist, "repeat", &val );
+ i_state = val.b_bool ? NSOnState : NSOffState;
+ [o_mi setState: i_state];
+ }
+ else if( [[o_mi title] isEqualToString: _NS("Repeat Playlist")] )
+ {
+ int i_state;
+ var_Get( p_playlist, "loop", &val );
+ i_state = val.b_bool ? NSOnState : NSOffState;
+ [o_mi setState: i_state];
+ }
+ else if( [[o_mi title] isEqualToString: _NS("Step Forward")] ||
+ [[o_mi title] isEqualToString: _NS("Step Backward")] )
+ {
+ if( p_playlist != NULL && p_input != NULL )
{
- vlc_object_release( (vlc_object_t *)p_aout );
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ bEnabled = p_input->stream.b_seekable;
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
}
else
{
}
else if( [[o_mi title] isEqualToString: _NS("Mute")] )
{
- aout_instance_t * p_aout;
-
- p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
- if( p_aout != NULL )
- {
- vlc_object_release( (vlc_object_t *)p_aout );
- }
- else
- {
- bEnabled = FALSE;
- }
-
[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")] ||
[[o_mi title] isEqualToString: _NS("Normal Size")] ||
- [[o_mi title] isEqualToString: _NS("Double Size")])
+ [[o_mi title] isEqualToString: _NS("Double Size")] ||
+ [[o_mi title] isEqualToString: _NS("Fit To Screen")] ||
+ [[o_mi title] isEqualToString: _NS("Float On Top")] )
{
id o_window;
NSArray *o_windows = [NSApp windows];
NSEnumerator *o_enumerator = [o_windows objectEnumerator];
bEnabled = FALSE;
- while ((o_window = [o_enumerator nextObject]))
+ if ( [[o_mi title] isEqualToString: _NS("Float On Top")] )
{
- if( [[o_window className] isEqualToString: @"VLCWindow"] )
+ int i_state = config_GetInt( p_playlist, "macosx-float" ) ?
+ NSOnState : NSOffState;
+ [o_mi setState: i_state];
+ }
+
+ vout_thread_t *p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
+ FIND_ANYWHERE );
+ if( p_vout != NULL )
+ {
+ while ((o_window = [o_enumerator nextObject]))
{
- bEnabled = TRUE;
- break;
+ if( [[o_window className] isEqualToString: @"VLCWindow"] )
+ {
+ bEnabled = TRUE;
+ break;
+ }
}
+ vlc_object_release( (vlc_object_t *)p_vout );
}
}
- else if( o_menu != nil &&
- [[o_menu title] isEqualToString: _NS("Deinterlace")] )
- {
-
- }
if( p_playlist != NULL )
{
}
@end
+
+/*****************************************************************************
+ * VLCMenuExt implementation
+ *****************************************************************************
+ * Object connected to a playlistitem which remembers the data belonging to
+ * the variable of the autogenerated menu
+ *****************************************************************************/
+@implementation VLCMenuExt
+
+- (id)initWithVar: (const char *)_psz_name Object: (int)i_id
+ Value: (vlc_value_t)val ofType: (int)_i_type
+{
+ self = [super init];
+
+ if( self != nil )
+ {
+ psz_name = strdup( _psz_name );
+ i_object_id = i_id;
+ value = val;
+ i_type = _i_type;
+ }
+
+ return( self );
+}
+
+- (void)dealloc
+{
+ free( psz_name );
+}
+
+- (char *)name
+{
+ return psz_name;
+}
+
+- (int)objectID
+{
+ return i_object_id;
+}
+
+- (vlc_value_t)value
+{
+ return value;
+}
+
+- (int)type
+{
+ return i_type;
+}
+
+@end
projects / vlc / blobdiff