X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fcontrols.m;h=8cea69c58ebbb443e428221b98efedf42207f9de;hb=eb22c2983bf039a74f9f6143a640438c8a16819d;hp=113dca602ff10fa839fb00c2376f5cc28f7298c4;hpb=e27abe75a1d2017799af345709d0db0bcb172a36;p=vlc diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m index 113dca602f..8cea69c58e 100644 --- a/modules/gui/macosx/controls.m +++ b/modules/gui/macosx/controls.m @@ -1,12 +1,12 @@ /***************************************************************************** - * controls.m: MacOS X interface plugin + * controls.m: MacOS X interface module ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: controls.m,v 1.28 2003/02/12 14:22:23 hartman Exp $ + * Copyright (C) 2002-2003 VideoLAN + * $Id$ * * Authors: Jon Lech Johansen * Christophe Massiot - * Derk-Jan Hartman + * Derk-Jan Hartman * * 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 @@ -32,49 +32,9 @@ #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)forward:(id)sender; -- (IBAction)backward:(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" +#include /***************************************************************************** * VLCControls implementation @@ -83,96 +43,121 @@ - (IBAction)play:(id)sender { + vlc_value_t val; + playlist_t * p_playlist; 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 ) + + val.i_int = PLAYING_S; + if( p_input ) { - return; + var_Get( p_input, "state", &val ); } - - if( playlist_IsPlaying( p_playlist ) ) + if( p_input && val.i_int != PAUSE_S ) { - playlist_Pause( p_playlist ); - vlc_object_release( p_playlist ); + vout_OSDMessage( p_intf, _( "Pause" ) ); + val.i_int = PAUSE_S; + var_Set( p_input, "state", val ); } else { - if( !playlist_IsEmpty( p_playlist ) ) + p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + if( p_playlist ) { - playlist_Play( p_playlist ); - vlc_object_release( p_playlist ); - } - else - { - vlc_object_release( p_playlist ); - [o_open openFile: nil]; + vlc_mutex_lock( &p_playlist->object_lock ); + if( p_playlist->i_size ) + { + vlc_mutex_unlock( &p_playlist->object_lock ); + vout_OSDMessage( p_intf, _( "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]; + } } } + if( p_input ) vlc_object_release( p_input ); } - (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; + vout_OSDMessage( p_intf, _( "Stop" ) ); + 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 ) + if( p_input != NULL ) { - return; + vlc_value_t val; val.b_bool = VLC_TRUE; + + var_Set( p_input, "rate-faster", val ); + vout_OSDMessage( p_intf, _( "Faster" ) ); + vlc_object_release( p_input ); } +} - vlc_mutex_lock( &p_playlist->object_lock ); - if( p_playlist->p_input != NULL ) +- (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 ) { - 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-slower", val ); + vout_OSDMessage( p_intf, _( "Slower" ) ); + vlc_object_release( p_input ); + } } -- (IBAction)slower:(id)sender +- (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 == NULL ) + if( p_playlist ) { - return; + playlist_Prev( p_playlist ); + vlc_object_release( p_playlist ); + vout_OSDMessage( p_intf, _( "Previous" ) ); } +} - vlc_mutex_lock( &p_playlist->object_lock ); - if( p_playlist->p_input != NULL ) +- (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 ) { - input_SetStatus( p_playlist->p_input, INPUT_STATUS_SLOWER ); + playlist_Next( p_playlist ); + vlc_object_release( p_playlist ); + vout_OSDMessage( p_intf, _( "Next" ) ); } - vlc_mutex_unlock( &p_playlist->object_lock ); - - vlc_object_release( p_playlist ); } -- (IBAction)prev:(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 ) @@ -180,45 +165,27 @@ return; } - vlc_mutex_lock( &p_playlist->object_lock ); - - if( p_playlist->p_input == NULL ) + var_Get( p_playlist, "random", &val ); + val.b_bool = !val.b_bool; + var_Set( p_playlist, "random", val ); + if( val.b_bool ) { - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); - return; - } - - vlc_mutex_lock( &p_playlist->p_input->stream.stream_lock ); - -#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--; - - vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock ); - input_ChangeArea( p_playlist->p_input, p_area ); - vlc_mutex_unlock( &p_playlist->object_lock ); - - p_intf->p_sys->b_chapter_update = VLC_TRUE; + vout_OSDMessage( p_intf, _( "Random On" ) ); } else { - vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock ); - vlc_mutex_unlock( &p_playlist->object_lock ); - playlist_Prev( p_playlist ); - } - -#undef p_area + vout_OSDMessage( p_intf, _( "Random Off" ) ); + } + p_intf->p_sys->b_playlist_update = VLC_TRUE; + p_intf->p_sys->b_intf_update = VLC_TRUE; vlc_object_release( p_playlist ); } -- (IBAction)next:(id)sender +- (IBAction)repeat:(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 ) @@ -226,45 +193,31 @@ return; } - vlc_mutex_lock( &p_playlist->object_lock ); - - if( p_playlist->p_input == NULL ) - { - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); - return; - } - - vlc_mutex_lock( &p_playlist->p_input->stream.stream_lock ); - -#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 ) + var_Get( p_playlist, "repeat", &val ); + if (!val.b_bool) + { + var_Set( p_playlist, "loop", val ); + } + val.b_bool = !val.b_bool; + var_Set( p_playlist, "repeat", val ); + if( val.b_bool ) { - p_area->i_part++; - - vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock ); - input_ChangeArea( p_playlist->p_input, p_area ); - vlc_mutex_unlock( &p_playlist->object_lock ); - - p_intf->p_sys->b_chapter_update = VLC_TRUE; + vout_OSDMessage( p_intf, _( "Repeat All" ) ); } else { - vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock ); - vlc_mutex_unlock( &p_playlist->object_lock ); - playlist_Next( p_playlist ); + vout_OSDMessage( p_intf, _( "Repeat Off" ) ); } -#undef p_area - + p_intf->p_sys->b_playlist_update = VLC_TRUE; + p_intf->p_sys->b_intf_update = VLC_TRUE; vlc_object_release( p_playlist ); } - (IBAction)loop:(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 ) @@ -272,40 +225,55 @@ return; } - config_PutInt( p_playlist, "loop", - !config_GetInt( p_playlist, "loop" ) ); + var_Get( p_playlist, "loop", &val ); + if (!val.b_bool) + { + var_Set( p_playlist, "repeat", val ); + } + val.b_bool = !val.b_bool; + var_Set( p_playlist, "loop", val ); + if( val.b_bool ) + { + vout_OSDMessage( p_intf, _( "Repeat One" ) ); + } + else + { + vout_OSDMessage( p_intf, _( "Repeat Off" ) ); + } + p_intf->p_sys->b_playlist_update = VLC_TRUE; + p_intf->p_sys->b_intf_update = VLC_TRUE; vlc_object_release( p_playlist ); } - (IBAction)forward:(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 || p_playlist->p_input == NULL ) + if( p_input != NULL ) { - if ( p_playlist != NULL ) vlc_object_release( p_playlist ); - return; + vlc_value_t time; + time.i_time = 10 * 1000000; + var_Set( p_input, "time-offset", time ); + vout_OSDMessage( p_intf, _( "Jump +10 Seconds" ) ); + vlc_object_release( p_input ); } - - input_Seek( p_playlist->p_input, 5, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); - vlc_object_release( p_playlist ); } - (IBAction)backward:(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 || p_playlist->p_input == NULL ) + if( p_input != NULL ) { - if ( p_playlist != NULL ) vlc_object_release( p_playlist ); - return; + vlc_value_t time; + time.i_time = -10 * 1000000; + var_Set( p_input, "time-offset", time ); + vout_OSDMessage( p_intf, _( "Jump -10 Seconds" ) ); + vlc_object_release( p_input ); } - - input_Seek( p_playlist->p_input, -5, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); - vlc_object_release( p_playlist ); } - (IBAction)volumeUp:(id)sender @@ -362,300 +330,285 @@ aout_VolumeGet( p_intf, &i_volume ); - [o_volumeslider setFloatValue: (float)(i_volume / AOUT_VOLUME_STEP)]; -} + [o_volumeslider setFloatValue: (float)(i_volume / AOUT_VOLUME_STEP)]; -- (IBAction)halfWindow:(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: 0.5]; - } - } + vout_OSDMessage( p_intf, "Vol %d%%", i_volume*100/AOUT_VOLUME_MAX ); } -- (IBAction)normalWindow:(id)sender +- (IBAction)windowAction:(id)sender { id o_window = [NSApp keyWindow]; - NSArray *o_windows = [NSApp windows]; + NSString *o_title = [sender title]; + NSArray *o_windows = [NSApp orderedWindows]; NSEnumerator *o_enumerator = [o_windows objectEnumerator]; - - while ((o_window = [o_enumerator nextObject])) - { - if( [[o_window className] isEqualToString: @"VLCWindow"] ) - { - [o_window scaleWindowWithFactor: 1]; - } - } -} + vout_thread_t *p_vout = vlc_object_find( [NSApp getIntf], VLC_OBJECT_VOUT, + FIND_ANYWHERE ); -- (IBAction)doubleWindow:(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( p_vout != NULL ) { - if( [[o_window className] isEqualToString: @"VLCWindow"] ) + while ((o_window = [o_enumerator nextObject])) { - [o_window scaleWindowWithFactor: 2]; + if( [[o_window className] isEqualToString: @"VLCWindow"] ) + { + 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]; + } + else + { + [o_window toggleFullscreen]; + } + break; + } } + vlc_object_release( (vlc_object_t *)p_vout ); } } - -- (IBAction)fullscreen:(id)sender +- (void)setupVarMenuItem:(NSMenuItem *)o_mi + target:(vlc_object_t *)p_object + var:(const char *)psz_variable + selector:(SEL)pf_callback { - 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 toggleFullscreen]; - } + 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; } -} - -- (IBAction)deinterlace:(id)sender -{ - intf_thread_t * p_intf = [NSApp getIntf]; - BOOL bEnable = [sender state] == NSOffState; - if( bEnable ) + /* Make sure we want to display the variable */ + if( i_type & VLC_VAR_HASCHOICE ) { - config_PutPsz( p_intf, "filter", "deinterlace" ); - config_PutPsz( p_intf, "deinterlace-mode", - [[sender title] lossyCString] ); + 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; } - else - { - config_PutPsz( p_intf, "filter", NULL ); - } -} - -- (IBAction)toggleProgram:(id)sender -{ - NSMenuItem * o_mi = (NSMenuItem *)sender; - intf_thread_t * p_intf = [NSApp getIntf]; + + /* 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 ) ]]; - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) + var_Get( p_object, psz_variable, &val ); + if( i_type & VLC_VAR_HASCHOICE ) { - return; - } - - vlc_mutex_lock( &p_playlist->object_lock ); + NSMenu *o_menu = [o_mi submenu]; - if( p_playlist->p_input == NULL ) - { - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); + [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; } - if( [o_mi state] == NSOffState ) + VLCMenuExt *o_data; + switch( i_type & VLC_VAR_TYPE ) { - u16 i_program_id = [o_mi tag]; - - input_ChangeProgram( p_playlist->p_input, i_program_id ); - input_SetStatus( p_playlist->p_input, INPUT_STATUS_PLAY ); - } + 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; - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); -} + 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; -- (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 ) - { + default: + if( text.psz_string ) free( text.psz_string ); return; } - vlc_mutex_lock( &p_playlist->object_lock ); - - if( p_playlist->p_input == NULL ) - { - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); - return; - } - - if( [o_mi state] == NSOffState ) - { - int i_title = [o_mi tag]; - -#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 - } - - 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 subtitle file")]; - [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]; + case VLC_VAR_VARIABLE: - vlc_mutex_lock( &p_input->stream.stream_lock ); + /* 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 ]; -#define ES p_input->stream.pp_selected_es[i] + break; - /* 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; - } - } + case VLC_VAR_INTEGER: -#undef ES + 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]; - vlc_mutex_unlock( &p_input->stream.stream_lock ); + 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; - input_ToggleES( p_input, p_es, 1 ); + 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 @@ -665,9 +618,8 @@ - (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 ); @@ -713,16 +665,30 @@ 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("Random")] ) { - 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("Repeat One")] ) + { + 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 All")] ) + { + 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")] || @@ -746,50 +712,35 @@ 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]; + NSArray *o_windows = [NSApp orderedWindows]; 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"] ) - { - bEnabled = TRUE; - break; - } + int i_state = config_GetInt( p_playlist, "video-on-top" ) ? + NSOnState : NSOffState; + [o_mi setState: i_state]; } - } - else if( o_menu != nil && - [[o_menu title] isEqualToString: _NS("Deinterlace")] ) - { - char * psz_filter = config_GetPsz( p_intf, "filter" ); - if( psz_filter != NULL ) - { - free( psz_filter ); - - psz_filter = config_GetPsz( p_intf, "deinterlace-mode" ); - } - - if( psz_filter != NULL ) + vout_thread_t *p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, + FIND_ANYWHERE ); + if( p_vout != NULL ) { - if( strcmp( psz_filter, [[o_mi title] lossyCString] ) == 0 ) + while ((o_window = [o_enumerator nextObject])) { - [o_mi setState: NSOnState]; - } - else - { - [o_mi setState: NSOffState]; + if( [[o_window className] isEqualToString: @"VLCWindow"] ) + { + bEnabled = TRUE; + break; + } } - - free( psz_filter ); - } - else - { - [o_mi setState: NSOffState]; + vlc_object_release( (vlc_object_t *)p_vout ); } } @@ -803,3 +754,54 @@ } @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