X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fcontrols.m;h=7a8d41b8af8965658c38eea4ff5969e3abd1dfd7;hb=3fc95408700235bb3bfd6fbb6e328fae850388c8;hp=48af1e28888eafe27ef74fc5679f0cd7affa1c54;hpb=83eee353a88c70478980626b3cfcfdcfd204d743;p=vlc diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m index 48af1e2888..7a8d41b8af 100644 --- a/modules/gui/macosx/controls.m +++ b/modules/gui/macosx/controls.m @@ -1,18 +1,20 @@ /***************************************************************************** - * controls.m: MacOS X interface plugin + * controls.m: MacOS X interface module ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: controls.m,v 1.26 2003/02/10 00:16:51 hartman Exp $ + * Copyright (C) 2002-2007 the VideoLAN team + * $Id$ * * Authors: Jon Lech Johansen * Christophe Massiot - * Derk-Jan Hartman + * Derk-Jan Hartman + * Benjamin Pracht + * Felix Kühne * * 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 * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -20,7 +22,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -30,662 +32,870 @@ #include /* for MAXPATHLEN */ #include -#include "intf.h" -#include "vout.h" +#import "intf.h" +#import "vout.h" +#import "open.h" +#import "controls.h" +#import "playlist.h" +#include +#include /***************************************************************************** - * VLCControls interface + * VLCControls implementation *****************************************************************************/ -@interface VLCControls : NSObject -{ - IBOutlet id o_open; - IBOutlet id o_main; +@implementation VLCControls - IBOutlet id o_volumeslider; +- (id)init +{ + [super init]; + o_fs_panel = [[VLCFSPanel alloc] init]; + return self; } -- (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; +- (void)awakeFromNib +{ + [o_specificTime_mi setTitle: _NS("Jump To Time")]; + [o_specificTime_cancel_btn setTitle: _NS("Cancel")]; + [o_specificTime_ok_btn setTitle: _NS("OK")]; + [o_specificTime_sec_lbl setStringValue: _NS("sec.")]; + [o_specificTime_goTo_lbl setStringValue: _NS("Jump to time")]; -- (IBAction)forward:(id)sender; -- (IBAction)backward:(id)sender; + o_repeat_off = [NSImage imageNamed:@"repeat_embedded"]; -- (IBAction)volumeUp:(id)sender; -- (IBAction)volumeDown:(id)sender; -- (IBAction)mute:(id)sender; -- (IBAction)volumeSliderUpdated:(id)sender; -- (void)updateVolumeSlider; + [self controlTintChanged]; -- (IBAction)halfWindow:(id)sender; -- (IBAction)normalWindow:(id)sender; -- (IBAction)doubleWindow:(id)sender; -- (IBAction)fullscreen:(id)sender; -- (IBAction)deinterlace:(id)sender; + [[NSNotificationCenter defaultCenter] addObserver: self + selector: @selector( controlTintChanged ) + name: NSControlTintDidChangeNotification + object: nil]; +} -- (IBAction)toggleProgram:(id)sender; -- (IBAction)toggleTitle:(id)sender; -- (IBAction)toggleChapter:(id)sender; -- (IBAction)toggleLanguage:(id)sender; -- (IBAction)toggleVar:(id)sender; +- (void)controlTintChanged +{ + int i_repeat = 0; + if( [o_btn_repeat image] == o_repeat_single ) + i_repeat = 1; + else if( [o_btn_repeat image] == o_repeat_all ) + i_repeat = 2; -@end + if( [NSColor currentControlTint] == NSGraphiteControlTint ) + { + o_repeat_single = [NSImage imageNamed:@"repeat_single_embedded_graphite"]; + o_repeat_all = [NSImage imageNamed:@"repeat_embedded_graphite"]; + + [o_btn_shuffle setAlternateImage: [NSImage imageNamed: @"shuffle_embedded_graphite"]]; + [o_btn_addNode setAlternateImage: [NSImage imageNamed: @"add_embedded_graphite"]]; + } + else + { + o_repeat_single = [NSImage imageNamed:@"repeat_single_embedded_blue"]; + o_repeat_all = [NSImage imageNamed:@"repeat_embedded_blue"]; + + [o_btn_shuffle setAlternateImage: [NSImage imageNamed: @"shuffle_embedded_blue"]]; + [o_btn_addNode setAlternateImage: [NSImage imageNamed: @"add_embedded_blue"]]; + } + + /* update the repeat button, but keep its state */ + if( i_repeat == 1 ) + [self repeatOne]; + else if( i_repeat == 2 ) + [self repeatAll]; + else + [self repeatOff]; +} -/***************************************************************************** - * VLCControls implementation - *****************************************************************************/ -@implementation VLCControls +- (void)dealloc +{ + [[NSNotificationCenter defaultCenter] removeObserver: self]; + + [o_repeat_single release]; + [o_repeat_all release]; + [o_repeat_off release]; + + [super dealloc]; +} - (IBAction)play:(id)sender { - intf_thread_t * p_intf = [NSApp getIntf]; + vlc_value_t val; + intf_thread_t * p_intf = VLCIntf; + playlist_t * p_playlist = pl_Yield( p_intf ); - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) + vlc_mutex_lock( &p_playlist->object_lock ); + if( playlist_IsEmpty( p_playlist ) ) { - return; + vlc_mutex_unlock( &p_playlist->object_lock ); + vlc_object_release( p_playlist ); + [o_main intfOpenFileGeneric: (id)sender]; } - - if( playlist_IsPlaying( p_playlist ) ) + else { - playlist_Pause( p_playlist ); + vlc_mutex_unlock( &p_playlist->object_lock ); vlc_object_release( p_playlist ); } - else + + val.i_int = config_GetInt( p_intf, "key-play-pause" ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); +} + +/* Small helper method */ + +-(id) getVoutView +{ + id o_window; + id o_vout_view = nil; + id o_embedded_vout_list = [[VLCMain sharedInstance] getEmbeddedList]; + NSEnumerator *o_enumerator = [[NSApp orderedWindows] objectEnumerator]; + while( !o_vout_view && ( o_window = [o_enumerator nextObject] ) ) { - if( !playlist_IsEmpty( p_playlist ) ) + /* We have an embedded vout */ + if( [o_embedded_vout_list windowContainsEmbedded: o_window] ) { - playlist_Play( p_playlist ); - vlc_object_release( p_playlist ); + o_vout_view = [o_embedded_vout_list getViewForWindow: o_window]; } - else + /* We have a detached vout */ + else if( [[o_window className] isEqualToString: @"VLCVoutWindow"] ) { - vlc_object_release( p_playlist ); - [o_open openFile: nil]; + msg_Dbg( VLCIntf, "detached vout controls.m call getVoutView" ); + o_vout_view = [o_window getVoutView]; } } + return o_vout_view; } + - (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 ) - { - return; - } - - 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_libvlc, "key-pressed", val ); } - (IBAction)faster:(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 ) - { - return; - } + vlc_value_t val; + intf_thread_t * p_intf = VLCIntf; + val.i_int = config_GetInt( p_intf, "key-faster" ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); +} - vlc_mutex_lock( &p_playlist->object_lock ); - if( p_playlist->p_input != NULL ) - { - input_SetStatus( p_playlist->p_input, INPUT_STATUS_FASTER ); - } - vlc_mutex_unlock( &p_playlist->object_lock ); +- (IBAction)slower:(id)sender +{ + vlc_value_t val; + intf_thread_t * p_intf = VLCIntf; + val.i_int = config_GetInt( p_intf, "key-slower" ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); +} - vlc_object_release( p_playlist ); +- (IBAction)prev:(id)sender +{ + vlc_value_t val; + intf_thread_t * p_intf = VLCIntf; + val.i_int = config_GetInt( p_intf, "key-prev" ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); } -- (IBAction)slower:(id)sender +- (IBAction)next:(id)sender { - intf_thread_t * p_intf = [NSApp getIntf]; + vlc_value_t val; + intf_thread_t * p_intf = VLCIntf; + val.i_int = config_GetInt( p_intf, "key-next" ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); +} - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) +- (IBAction)random:(id)sender +{ + vlc_value_t val; + intf_thread_t * p_intf = VLCIntf; + playlist_t * p_playlist = pl_Yield( p_intf ); + + var_Get( p_playlist, "random", &val ); + val.b_bool = !val.b_bool; + var_Set( p_playlist, "random", val ); + if( val.b_bool ) { - return; + vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Random On" ) ); + config_PutInt( p_playlist, "random", 1 ); } - - vlc_mutex_lock( &p_playlist->object_lock ); - if( p_playlist->p_input != NULL ) + else { - input_SetStatus( p_playlist->p_input, INPUT_STATUS_SLOWER ); + vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Random Off" ) ); + config_PutInt( p_playlist, "random", 0 ); } - vlc_mutex_unlock( &p_playlist->object_lock ); + p_intf->p_sys->b_playmode_update = VLC_TRUE; + p_intf->p_sys->b_intf_update = VLC_TRUE; vlc_object_release( p_playlist ); } -- (IBAction)prev:(id)sender +/* three little ugly helpers */ +- (void)repeatOne +{ + [o_btn_repeat setImage: o_repeat_single]; + [o_btn_repeat setAlternateImage: o_repeat_all]; +} +- (void)repeatAll +{ + [o_btn_repeat setImage: o_repeat_all]; + [o_btn_repeat setAlternateImage: o_repeat_off]; +} +- (void)repeatOff { - intf_thread_t * p_intf = [NSApp getIntf]; + [o_btn_repeat setImage: o_repeat_off]; + [o_btn_repeat setAlternateImage: o_repeat_single]; +} +- (void)shuffle +{ + vlc_value_t val; + playlist_t *p_playlist = pl_Yield( VLCIntf ); + var_Get( p_playlist, "random", &val ); + [o_btn_shuffle setState: val.b_bool]; + vlc_object_release( p_playlist ); +} - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) - { - return; - } +- (IBAction)repeatButtonAction:(id)sender +{ + vlc_value_t looping,repeating; + intf_thread_t * p_intf = VLCIntf; + playlist_t * p_playlist = pl_Yield( p_intf ); - vlc_mutex_lock( &p_playlist->object_lock ); + var_Get( p_playlist, "repeat", &repeating ); + var_Get( p_playlist, "loop", &looping ); - if( p_playlist->p_input == NULL ) + if( !repeating.b_bool && !looping.b_bool ) { - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); - return; + /* was: no repeating at all, switching to Repeat One */ + + /* set our button's look */ + [self repeatOne]; + + /* prepare core communication */ + repeating.b_bool = VLC_TRUE; + looping.b_bool = VLC_FALSE; + config_PutInt( p_playlist, "repeat", 1 ); + config_PutInt( p_playlist, "loop", 0 ); + + /* show the change */ + vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat One" ) ); } - - 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 ) + else if( repeating.b_bool && !looping.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; + /* was: Repeat One, switching to Repeat All */ + + /* set our button's look */ + [self repeatAll]; + + /* prepare core communication */ + repeating.b_bool = VLC_FALSE; + looping.b_bool = VLC_TRUE; + config_PutInt( p_playlist, "repeat", 0 ); + config_PutInt( p_playlist, "loop", 1 ); + + /* show the change */ + vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat All" ) ); } else { - vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock ); - vlc_mutex_unlock( &p_playlist->object_lock ); - playlist_Prev( p_playlist ); + /* was: Repeat All or bug in VLC, switching to Repeat Off */ + + /* set our button's look */ + [self repeatOff]; + + /* prepare core communication */ + repeating.b_bool = VLC_FALSE; + looping.b_bool = VLC_FALSE; + config_PutInt( p_playlist, "repeat", 0 ); + config_PutInt( p_playlist, "loop", 0 ); + + /* show the change */ + vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat Off" ) ); } -#undef p_area + /* communicate with core and the main intf loop */ + var_Set( p_playlist, "repeat", repeating ); + var_Set( p_playlist, "loop", looping ); + p_intf->p_sys->b_playmode_update = VLC_TRUE; + p_intf->p_sys->b_intf_update = VLC_TRUE; vlc_object_release( p_playlist ); } -- (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 == NULL ) - { - return; - } - vlc_mutex_lock( &p_playlist->object_lock ); +- (IBAction)repeat:(id)sender +{ + vlc_value_t val; + intf_thread_t * p_intf = VLCIntf; + playlist_t * p_playlist = pl_Yield( p_intf ); - if( p_playlist->p_input == NULL ) + var_Get( p_playlist, "repeat", &val ); + if (!val.b_bool) { - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); - return; + var_Set( p_playlist, "loop", val ); } - - 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 ) + 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, DEFAULT_CHAN, _( "Repeat One" ) ); + config_PutInt( p_playlist, "repeat", 1 ); } 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, DEFAULT_CHAN, _( "Repeat Off" ) ); + config_PutInt( p_playlist, "repeat", 0 ); } - -#undef p_area - + + p_intf->p_sys->b_playmode_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; + intf_thread_t * p_intf = VLCIntf; + playlist_t * p_playlist = pl_Yield( p_intf ); - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) + var_Get( p_playlist, "loop", &val ); + if (!val.b_bool) { - return; + 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, DEFAULT_CHAN, _( "Repeat All" ) ); + config_PutInt( p_playlist, "loop", 1 ); + } + else + { + vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat Off" ) ); + config_PutInt( p_playlist, "loop", 0 ); } - config_PutInt( p_playlist, "loop", - !config_GetInt( p_playlist, "loop" ) ); - + p_intf->p_sys->b_playmode_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, - FIND_ANYWHERE ); - if( p_playlist == NULL || p_playlist->p_input == NULL ) - { - if ( p_playlist != NULL ) vlc_object_release( p_playlist ); - return; - } - - input_Seek( p_playlist->p_input, 5, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); - vlc_object_release( p_playlist ); + vlc_value_t val; + intf_thread_t * p_intf = VLCIntf; + val.i_int = config_GetInt( p_intf, "key-jump+short" ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); } - (IBAction)backward:(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 || p_playlist->p_input == NULL ) - { - if ( p_playlist != NULL ) vlc_object_release( p_playlist ); - return; - } - - input_Seek( p_playlist->p_input, -5, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); - vlc_object_release( p_playlist ); + vlc_value_t val; + intf_thread_t * p_intf = VLCIntf; + val.i_int = config_GetInt( p_intf, "key-jump-short" ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); } + - (IBAction)volumeUp:(id)sender { - intf_thread_t * p_intf = [NSApp getIntf]; - - aout_VolumeUp( p_intf, 1, NULL ); - - if( p_intf->p_sys->b_mute ) - { - [self mute: nil]; - } - - [self updateVolumeSlider]; + 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_libvlc, "key-pressed", val ); + /* Manage volume status */ + [o_main manageVolumeSlider]; } - (IBAction)volumeDown:(id)sender { - intf_thread_t * p_intf = [NSApp getIntf]; - - aout_VolumeDown( p_intf, 1, NULL ); - - if( p_intf->p_sys->b_mute ) - { - [self mute: nil]; - } - - [self updateVolumeSlider]; + 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_libvlc, "key-pressed", val ); + /* Manage volume status */ + [o_main manageVolumeSlider]; } - (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 ); - - [self updateVolumeSlider]; + 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_libvlc, "key-pressed", val ); + /* Manage volume status */ + [o_main manageVolumeSlider]; } - (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 ); + int i_volume_step = 0; + i_volume_step = config_GetInt( p_intf->p_libvlc, "volume-step" ); + aout_VolumeSet( p_intf, i_volume * i_volume_step ); + /* Manage volume status */ + [o_main manageVolumeSlider]; } -- (void)updateVolumeSlider +- (IBAction)showPosition: (id)sender { - intf_thread_t * p_intf = [NSApp getIntf]; - audio_volume_t i_volume; - - aout_VolumeGet( p_intf, &i_volume ); + vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT, + FIND_ANYWHERE ); + if( p_vout != NULL ) + { + vlc_value_t val; + intf_thread_t * p_intf = VLCIntf; + val.i_int = config_GetInt( p_intf, "key-position" ); + var_Set( p_intf, "key-pressed", val ); + vlc_object_release( (vlc_object_t *)p_vout ); + } +} - [o_volumeslider setFloatValue: (float)(i_volume / AOUT_VOLUME_STEP)]; +- (IBAction)toogleFullscreen:(id)sender { + NSMenuItem *o_mi = [[NSMenuItem alloc] initWithTitle: _NS("Fullscreen") action: nil keyEquivalent:@""]; + [self windowAction: [o_mi autorelease]]; } -- (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])) +- (BOOL) isFullscreen { + id o_vout_view = [self getVoutView]; + if( o_vout_view ) { - if( [[o_window className] isEqualToString: @"VLCWindow"] ) - { - [o_window scaleWindowWithFactor: 0.5]; - } + return [o_vout_view isFullscreen]; } + return NO; } -- (IBAction)normalWindow:(id)sender +- (IBAction)windowAction:(id)sender { - id o_window = [NSApp keyWindow]; - NSArray *o_windows = [NSApp windows]; - NSEnumerator *o_enumerator = [o_windows objectEnumerator]; - - while ((o_window = [o_enumerator nextObject])) + NSString *o_title = [sender title]; + + vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT, + FIND_ANYWHERE ); + if( p_vout != NULL ) { - if( [[o_window className] isEqualToString: @"VLCWindow"] ) + id o_vout_view = [self getVoutView]; + if( o_vout_view ) { - [o_window scaleWindowWithFactor: 1]; + if( [o_title isEqualToString: _NS("Half Size") ] ) + [o_vout_view scaleWindowWithFactor: 0.5 animate: YES]; + else if( [o_title isEqualToString: _NS("Normal Size") ] ) + [o_vout_view scaleWindowWithFactor: 1.0 animate: YES]; + else if( [o_title isEqualToString: _NS("Double Size") ] ) + [o_vout_view scaleWindowWithFactor: 2.0 animate: YES]; + else if( [o_title isEqualToString: _NS("Float on Top") ] ) + [o_vout_view toggleFloatOnTop]; + else if( [o_title isEqualToString: _NS("Fit to Screen") ] ) + { + id o_window = [o_vout_view getWindow]; + if( ![o_window isZoomed] ) + [o_window performZoom:self]; + } + else if( [o_title isEqualToString: _NS("Snapshot") ] ) + { + [o_vout_view snapshot]; + } + else + { + [o_vout_view toggleFullscreen]; + } } + vlc_object_release( (vlc_object_t *)p_vout ); } -} - -- (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])) + else { - if( [[o_window className] isEqualToString: @"VLCWindow"] ) + playlist_t * p_playlist = pl_Yield( VLCIntf ); + + if( [o_title isEqualToString: _NS("Fullscreen")] || + [sender isKindOfClass:[NSButton class]] ) { - [o_window scaleWindowWithFactor: 2]; + vlc_value_t val; + var_Get( p_playlist, "fullscreen", &val ); + var_Set( p_playlist, "fullscreen", (vlc_value_t)!val.b_bool ); } + + vlc_object_release( p_playlist ); } -} +} -- (IBAction)fullscreen:(id)sender +- (void)scrollWheel:(NSEvent *)theEvent { - 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 = VLCIntf; + float f_yabsvalue = [theEvent deltaY] > 0.0f ? [theEvent deltaY] : -[theEvent deltaY]; + float f_xabsvalue = [theEvent deltaX] > 0.0f ? [theEvent deltaX] : -[theEvent deltaX]; + int i, i_yvlckey, i_xvlckey; + + if ([theEvent deltaY] < 0.0f) + i_yvlckey = KEY_MOUSEWHEELDOWN; + else + i_yvlckey = KEY_MOUSEWHEELUP; + + if ([theEvent deltaX] < 0.0f) + i_xvlckey = KEY_MOUSEWHEELRIGHT; + else + i_xvlckey = KEY_MOUSEWHEELLEFT; + + /* Send multiple key event, depending on the intensity of the event */ + for (i = 0; i < (int)(f_yabsvalue/4.+1.) && f_yabsvalue > 0.05 ; i++) + var_SetInteger( p_intf->p_libvlc, "key-pressed", i_yvlckey ); + + /* Prioritize Y event (sound volume) over X event */ + if (f_yabsvalue < 0.05) { - if( [[o_window className] isEqualToString: @"VLCWindow"] ) - { - [o_window toggleFullscreen]; - } + for (i = 0; i < (int)(f_xabsvalue/6.+1.) && f_xabsvalue > 0.05; i++) + var_SetInteger( p_intf->p_libvlc, "key-pressed", i_xvlckey ); } } -- (IBAction)deinterlace:(id)sender +- (BOOL)keyEvent:(NSEvent *)o_event { - intf_thread_t * p_intf = [NSApp getIntf]; - BOOL bEnable = [sender state] == NSOffState; - - if( bEnable ) - { - config_PutPsz( p_intf, "filter", "deinterlace" ); - config_PutPsz( p_intf, "deinterlace-mode", - [[sender title] lossyCString] ); Ê - } - else + BOOL eventHandled = NO; + unichar key = [[o_event charactersIgnoringModifiers] characterAtIndex: 0]; + + if( key ) { - config_PutPsz( p_intf, "filter", NULL ); + vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT, + FIND_ANYWHERE ); + if( p_vout != NULL ) + { + /* Escape */ + if( key == (unichar) 0x1b ) + { + id o_vout_view = [self getVoutView]; + if( o_vout_view && [o_vout_view isFullscreen] ) + { + [o_vout_view toggleFullscreen]; + eventHandled = YES; + } + } + else if( key == ' ' ) + { + [self play:self]; + eventHandled = YES; + } + vlc_object_release( (vlc_object_t *)p_vout ); + } } + return eventHandled; } -- (IBAction)toggleProgram:(id)sender +- (void)setupVarMenuItem:(NSMenuItem *)o_mi + 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, text; + int i_type = var_Type( p_object, psz_variable ); - 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; } + + /* Make sure we want to display the variable */ + if( i_type & VLC_VAR_HASCHOICE ) + { + 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: [[VLCMain sharedInstance] localizedString: text.psz_string ? + text.psz_string : strdup( psz_variable ) ]]; - vlc_mutex_lock( &p_playlist->object_lock ); - - if( p_playlist->p_input == NULL ) + var_Get( p_object, psz_variable, &val ); + if( i_type & VLC_VAR_HASCHOICE ) { - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); + NSMenu *o_menu = [o_mi submenu]; + + [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; + + 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]]]; + if( !( i_type & VLC_VAR_ISCOMMAND ) ) + [o_mi setState: val.b_bool ? TRUE : FALSE ]; + break; + + 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)toggleTitle:(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 ) + { + 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 { - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); return; } - if( [o_mi state] == NSOffState ) + switch( i_type & VLC_VAR_TYPE ) { - 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 + 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_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); -} - -- (IBAction)toggleChapter:(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 ) + if( var_Get( p_object, psz_variable, &val ) < 0 ) { return; } - vlc_mutex_lock( &p_playlist->object_lock ); - - if( p_playlist->p_input == NULL ) + if( var_Change( p_object, psz_variable, VLC_VAR_GETLIST, + &val_list, &text_list ) < 0 ) { - 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 ); return; } - if( [o_mi state] == NSOffState ) + /* make (un)sensitive */ + [o_parent setEnabled: ( val_list.p_list->i_count > 1 )]; + + for( i = 0; i < val_list.p_list->i_count; i++ ) { - int i_chapter = [o_mi tag]; + vlc_value_t another_val; + NSMenuItem * o_lmi; + NSString *o_title = @""; + VLCMenuExt *o_data; -#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 + switch( i_type & VLC_VAR_TYPE ) + { + case VLC_VAR_STRING: + another_val.psz_string = + strdup(val_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: @""]; + 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 ) && !( i_type & VLC_VAR_ISCOMMAND ) ) + [o_lmi setState: TRUE ]; + + break; + + case VLC_VAR_INTEGER: + + o_title = 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]; + + 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 && !( i_type & VLC_VAR_ISCOMMAND ) ) + [o_lmi setState: TRUE ]; + break; + + default: + break; + } } - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); + /* 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 ); } -- (IBAction)toggleLanguage:(id)sender +- (IBAction)toggleVar:(id)sender { - NSMenuItem * o_mi = (NSMenuItem *)sender; - intf_thread_t * p_intf = [NSApp getIntf]; + NSMenuItem *o_mi = (NSMenuItem *)sender; + VLCMenuExt *o_data = [[o_mi representedObject] pointerValue]; + [NSThread detachNewThreadSelector: @selector(toggleVarThread:) + toTarget: self withObject: o_data]; - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) - { - return; - } + return; +} - vlc_mutex_lock( &p_playlist->object_lock ); +- (int)toggleVarThread: (id)_o_data +{ + vlc_object_t *p_object; + NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; + VLCMenuExt *o_data = (VLCMenuExt *)_o_data; + + vlc_thread_set_priority( VLCIntf , VLC_THREAD_PRIORITY_LOW ); + + p_object = (vlc_object_t *)vlc_object_get( [o_data objectID] ); - if( p_playlist->p_input == NULL ) + if( p_object != NULL ) { - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); - return; + 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; +} -#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 ) +- (IBAction)goToSpecificTime:(id)sender +{ + if( sender == o_specificTime_cancel_btn ) { - 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] )); - } + [NSApp endSheet: o_specificTime_win]; + [o_specificTime_win close]; } -#endif - -#define p_input p_playlist->p_input - - if( !p_intf->p_sys->b_audio_update ) + else if( sender == o_specificTime_ok_btn ) { - NSValue * o_value = [o_mi representedObject]; - es_descriptor_t * p_es = [o_value pointerValue]; - - if( [o_mi state] == NSOnState ) - { - /* we just have one ES to disable */ - input_ToggleES( p_input, p_es, 0 ); - } - else + input_thread_t * p_input = (input_thread_t *)vlc_object_find( VLCIntf, \ + VLC_OBJECT_INPUT, FIND_ANYWHERE ); + if( p_input ) { - 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++ ) + unsigned int timeInSec = 0; + NSString * fieldContent = [o_specificTime_enter_fld stringValue]; + if( [[fieldContent componentsSeparatedByString: @":"] count] > 1 && + [[fieldContent componentsSeparatedByString: @":"] count] <= 3 ) { - if( ES->i_cat == i_cat ) + NSArray * ourTempArray = \ + [fieldContent componentsSeparatedByString: @":"]; + + if( [[fieldContent componentsSeparatedByString: @":"] count] == 3 ) { - vlc_mutex_unlock( &p_input->stream.stream_lock ); - input_ToggleES( p_input, ES, 0 ); - vlc_mutex_lock( &p_input->stream.stream_lock ); - break; + timeInSec += ([[ourTempArray objectAtIndex: 0] intValue] * 3600); //h + timeInSec += ([[ourTempArray objectAtIndex: 1] intValue] * 60); //m + timeInSec += [[ourTempArray objectAtIndex: 2] intValue]; //s + } + else + { + timeInSec += ([[ourTempArray objectAtIndex: 0] intValue] * 60); //m + timeInSec += [[ourTempArray objectAtIndex: 1] intValue]; //s } } + else + timeInSec = [fieldContent intValue]; -#undef ES - - vlc_mutex_unlock( &p_input->stream.stream_lock ); - - input_ToggleES( p_input, p_es, 1 ); + input_Control( p_input, INPUT_SET_TIME, (int64_t)(timeInSec * 1000000)); + vlc_object_release( p_input ); } + + [NSApp endSheet: o_specificTime_win]; + [o_specificTime_win close]; } - -#undef p_input - - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); -} - -- (IBAction)toggleVar:(id)sender -{ - NSMenuItem * o_mi = (NSMenuItem *)sender; - - if( [o_mi state] == NSOffState ) + else { - 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; - - if ( var_Set( p_object, psz_variable, val ) < 0 ) + input_thread_t * p_input = (input_thread_t *)vlc_object_find( VLCIntf, \ + VLC_OBJECT_INPUT, FIND_ANYWHERE ); + if( p_input ) { - msg_Warn( p_object, "cannot set variable (%s)", psz_value ); + /* we can obviously only do that if an input is available */ + vlc_value_t pos, length; + var_Get( p_input, "time", &pos ); + [o_specificTime_enter_fld setIntValue: (pos.i_time / 1000000)]; + var_Get( p_input, "length", &length ); + [o_specificTime_stepper setMaxValue: (length.i_time / 1000000)]; + + [NSApp beginSheet: o_specificTime_win modalForWindow: \ + [NSApp mainWindow] modalDelegate: self didEndSelector: nil \ + contextInfo: nil]; + [o_specificTime_win makeKeyWindow]; + vlc_object_release( p_input ); } + } +} - free( psz_value ); +- (id)getFSPanel +{ + if( o_fs_panel ) + return o_fs_panel; + else + { + msg_Err( VLCIntf, "FSPanel is nil" ); + return NULL; } } @end @implementation VLCControls (NSMenuValidation) - + - (BOOL)validateMenuItem:(NSMenuItem *)o_mi { BOOL bEnabled = TRUE; - NSMenu * o_menu = [o_mi menu]; - intf_thread_t * p_intf = [NSApp getIntf]; + vlc_value_t val; + intf_thread_t * p_intf = VLCIntf; + playlist_t * p_playlist = pl_Yield( p_intf ); - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - - if( p_playlist != NULL ) - { - vlc_mutex_lock( &p_playlist->object_lock ); - } + vlc_mutex_lock( &p_playlist->object_lock ); #define p_input p_playlist->p_input if( [[o_mi title] isEqualToString: _NS("Faster")] || [[o_mi title] isEqualToString: _NS("Slower")] ) { - if( p_playlist != NULL && p_input != NULL ) + if( 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->b_can_pace_control; } else { @@ -694,112 +904,170 @@ } else if( [[o_mi title] isEqualToString: _NS("Stop")] ) { - if( p_playlist == NULL || p_input == NULL ) + if( p_input == NULL ) { bEnabled = FALSE; } + [o_main setupMenus]; /* Make sure input menu is up to date */ } else if( [[o_mi title] isEqualToString: _NS("Previous")] || [[o_mi title] isEqualToString: _NS("Next")] ) { - if( p_playlist == NULL ) - { - bEnabled = FALSE; - } - else - { - bEnabled = p_playlist->i_size > 1; - - if( p_input != NULL ) - { - vlc_mutex_lock( &p_input->stream.stream_lock ); - bEnabled |= p_input->stream.p_selected_area->i_part_nb > 1; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - } - } + /** \todo fix i_size use */ + bEnabled = p_playlist->items.i_size > 1; } - 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")] || - [[o_mi title] isEqualToString: _NS("Step Backward")] ) + [[o_mi title] isEqualToString: _NS("Step Backward")] || + [[o_mi title] isEqualToString: _NS("Jump To Time")]) { - 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 + if( p_input != NULL ) { - bEnabled = FALSE; + var_Get( p_input, "seekable", &val); + bEnabled = val.b_bool; } + else bEnabled = FALSE; } - else if( [[o_mi title] isEqualToString: _NS("Mute")] ) + else if( [[o_mi title] isEqualToString: _NS("Mute")] ) { [o_mi setState: p_intf->p_sys->b_mute ? NSOnState : NSOffState]; + [o_main setupMenus]; /* Make sure audio menu is up to date */ } - 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("Double Size")] || + [[o_mi title] isEqualToString: _NS("Fit to Screen")] || + [[o_mi title] isEqualToString: _NS("Snapshot")] || + [[o_mi title] isEqualToString: _NS("Fullscreen")] || + [[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])) + + vout_thread_t *p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, + FIND_ANYWHERE ); + if( p_vout != NULL ) { - if( [[o_window className] isEqualToString: @"VLCWindow"] ) + if( [[o_mi title] isEqualToString: _NS("Float on Top")] ) + { + var_Get( p_vout, "video-on-top", &val ); + [o_mi setState: val.b_bool ? NSOnState : NSOffState]; + } + + while( (o_window = [o_enumerator nextObject])) { - bEnabled = TRUE; - break; + if( [[o_window className] isEqualToString: @"VLCVoutWindow"] || + [[[VLCMain sharedInstance] getEmbeddedList] + windowContainsEmbedded: o_window]) + { + bEnabled = TRUE; + break; + } } + vlc_object_release( (vlc_object_t *)p_vout ); } - } - 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 ) Ê - { Ê - if( strcmp( psz_filter, [[o_mi title] lossyCString] ) == 0 ) Ê - { Ê - [o_mi setState: NSOnState]; Ê - } Ê - else Ê - { Ê - [o_mi setState: NSOffState]; Ê - } Ê - - free( psz_filter ); Ê - } Ê - else Ê - { Ê - [o_mi setState: NSOffState]; Ê + else if( [[o_mi title] isEqualToString: _NS("Fullscreen")] ) + { + var_Get( p_playlist, "fullscreen", &val ); + [o_mi setState: val.b_bool]; + bEnabled = TRUE; } - } + [o_main setupMenus]; /* Make sure video menu is up to date */ + } + + vlc_mutex_unlock( &p_playlist->object_lock ); + vlc_object_release( p_playlist ); + + return( bEnabled ); +} + +@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( p_playlist != NULL ) + if( self != nil ) { - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); + psz_name = strdup( _psz_name ); + i_object_id = i_id; + value = val; + i_type = _i_type; } - return( bEnabled ); + return( self ); } +- (void)dealloc +{ + free( psz_name ); + [super dealloc]; +} + +- (char *)name +{ + return psz_name; +} + +- (int)objectID +{ + return i_object_id; +} + +- (vlc_value_t)value +{ + return value; +} + +- (int)type +{ + return i_type; +} + +@end + + +/***************************************************************************** + * VLCTimeField implementation + ***************************************************************************** + * we need this to catch our click-event in the controller window + *****************************************************************************/ + +@implementation VLCTimeField +- (void)mouseDown: (NSEvent *)ourEvent +{ + if( [ourEvent clickCount] > 1 ) + [[[VLCMain sharedInstance] getControls] goToSpecificTime: nil]; +} @end