X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fcontrols.m;h=f1d6b8cf770724b7690cdf76335518826c26fa3c;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=78de7cddd3f65b1b3e959e9947cb0b71e8fca734;hpb=b68c1a2b74a8cf927cb4b211a83c871fb6d7aa1d;p=vlc diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m index 78de7cddd3..f1d6b8cf77 100644 --- a/modules/gui/macosx/controls.m +++ b/modules/gui/macosx/controls.m @@ -1,18 +1,20 @@ /***************************************************************************** * controls.m: MacOS X interface module ***************************************************************************** - * Copyright (C) 2002-2005 VideoLAN + * Copyright (C) 2002-2006 the VideoLAN team * $Id$ * * Authors: Jon Lech Johansen * Christophe Massiot * 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,49 +32,90 @@ #include /* for MAXPATHLEN */ #include -#include "intf.h" -#include "vout.h" -#include "open.h" -#include "controls.h" -#include +#import "intf.h" +#import "vout.h" +#import "open.h" +#import "controls.h" +#import "playlist.h" +#include +#include /***************************************************************************** - * VLCControls implementation + * VLCControls implementation *****************************************************************************/ @implementation VLCControls +- (id)init +{ + [super init]; + o_fs_panel = [[VLCFSPanel alloc] init]; + return self; +} + +- (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)play:(id)sender { vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist ) + playlist_t * p_playlist = pl_Yield( p_intf ); + + vlc_mutex_lock( &p_playlist->object_lock ); + if( playlist_IsEmpty( p_playlist ) ) { - vlc_mutex_lock( &p_playlist->object_lock ); - if( p_playlist->i_size <= 0 ) + vlc_mutex_unlock( &p_playlist->object_lock ); + vlc_object_release( p_playlist ); + [o_main intfOpenFileGeneric: (id)sender]; + } + else + { + vlc_mutex_unlock( &p_playlist->object_lock ); + vlc_object_release( p_playlist ); + } + + 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] ) ) + { + /* We have an embedded vout */ + if( [o_embedded_vout_list windowContainsEmbedded: o_window] ) { - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); - [o_main intfOpenFileGeneric: (id)sender]; + o_vout_view = [o_embedded_vout_list getViewForWindow: o_window]; } - else + /* We have a detached vout */ + else if( [[o_window className] isEqualToString: @"VLCVoutWindow"] ) { - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); + msg_Dbg( VLCIntf, "detached vout controls.m call getVoutView" ); + o_vout_view = [o_window getVoutView]; } - } - val.i_int = config_GetInt( p_intf, "key-play-pause" ); - var_Set( p_intf->p_vlc, "key-pressed", val ); + return o_vout_view; } + - (IBAction)stop:(id)sender { vlc_value_t val; intf_thread_t * p_intf = VLCIntf; val.i_int = config_GetInt( p_intf, "key-stop" ); - var_Set( p_intf->p_vlc, "key-pressed", val ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); } - (IBAction)faster:(id)sender @@ -80,7 +123,7 @@ vlc_value_t val; intf_thread_t * p_intf = VLCIntf; val.i_int = config_GetInt( p_intf, "key-faster" ); - var_Set( p_intf->p_vlc, "key-pressed", val ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); } - (IBAction)slower:(id)sender @@ -88,7 +131,7 @@ vlc_value_t val; intf_thread_t * p_intf = VLCIntf; val.i_int = config_GetInt( p_intf, "key-slower" ); - var_Set( p_intf->p_vlc, "key-pressed", val ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); } - (IBAction)prev:(id)sender @@ -96,7 +139,7 @@ vlc_value_t val; intf_thread_t * p_intf = VLCIntf; val.i_int = config_GetInt( p_intf, "key-prev" ); - var_Set( p_intf->p_vlc, "key-pressed", val ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); } - (IBAction)next:(id)sender @@ -104,19 +147,14 @@ vlc_value_t val; intf_thread_t * p_intf = VLCIntf; val.i_int = config_GetInt( p_intf, "key-next" ); - var_Set( p_intf->p_vlc, "key-pressed", val ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); } - (IBAction)random:(id)sender { vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) - { - return; - } + playlist_t * p_playlist = pl_Yield( p_intf ); var_Get( p_playlist, "random", &val ); val.b_bool = !val.b_bool; @@ -124,45 +162,137 @@ if( val.b_bool ) { vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Random On" ) ); + config_PutInt( p_playlist, "random", 1 ); } else { vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Random Off" ) ); - } + config_PutInt( p_playlist, "random", 0 ); + } - p_intf->p_sys->b_playlist_update = VLC_TRUE; + p_intf->p_sys->b_playmode_update = VLC_TRUE; p_intf->p_sys->b_intf_update = VLC_TRUE; vlc_object_release( p_playlist ); } -- (IBAction)repeat:(id)sender +/* three little ugly helpers */ +- (void)repeatOne +{ + [o_btn_repeat setImage: [NSImage imageNamed:@"repeat_single_embedded_blue"]]; + [o_btn_repeat setAlternateImage: [NSImage imageNamed:@"repeat_embedded_blue"]]; +} +- (void)repeatAll +{ + [o_btn_repeat setImage: [NSImage imageNamed:@"repeat_embedded_blue"]]; + [o_btn_repeat setAlternateImage: [NSImage imageNamed:@"repeat_embedded"]]; +} +- (void)repeatOff +{ + [o_btn_repeat setImage: [NSImage imageNamed:@"repeat_embedded"]]; + [o_btn_repeat setAlternateImage: [NSImage imageNamed:@"repeat_single_embedded_blue"]]; +} +- (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 ); +} + +- (IBAction)repeatButtonAction:(id)sender +{ + vlc_value_t looping,repeating; intf_thread_t * p_intf = VLCIntf; - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) + playlist_t * p_playlist = pl_Yield( p_intf ); + + var_Get( p_playlist, "repeat", &repeating ); + var_Get( p_playlist, "loop", &looping ); + + if( !repeating.b_bool && !looping.b_bool ) { - 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" ) ); + } + else if( repeating.b_bool && !looping.b_bool ) + { + /* 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 + { + /* 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" ) ); } + /* 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)repeat:(id)sender +{ + vlc_value_t val; + intf_thread_t * p_intf = VLCIntf; + playlist_t * p_playlist = pl_Yield( p_intf ); + 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 ) { - vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat All" ) ); + vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat One" ) ); + config_PutInt( p_playlist, "repeat", 1 ); } else { vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat Off" ) ); + config_PutInt( p_playlist, "repeat", 0 ); } - - p_intf->p_sys->b_playlist_update = VLC_TRUE; + + p_intf->p_sys->b_playmode_update = VLC_TRUE; p_intf->p_sys->b_intf_update = VLC_TRUE; vlc_object_release( p_playlist ); } @@ -171,12 +301,7 @@ { vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) - { - return; - } + playlist_t * p_playlist = pl_Yield( p_intf ); var_Get( p_playlist, "loop", &val ); if (!val.b_bool) @@ -187,14 +312,16 @@ var_Set( p_playlist, "loop", val ); if( val.b_bool ) { - vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat One" ) ); + 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 ); + } - p_intf->p_sys->b_playlist_update = VLC_TRUE; + p_intf->p_sys->b_playmode_update = VLC_TRUE; p_intf->p_sys->b_intf_update = VLC_TRUE; vlc_object_release( p_playlist ); } @@ -203,16 +330,16 @@ { vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - val.i_int = config_GetInt( p_intf, "key-jump+10sec" ); - var_Set( p_intf->p_vlc, "key-pressed", val ); + val.i_int = config_GetInt( p_intf, "key-jump+short" ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); } - (IBAction)backward:(id)sender { vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - val.i_int = config_GetInt( p_intf, "key-jump-10sec" ); - var_Set( p_intf->p_vlc, "key-pressed", val ); + val.i_int = config_GetInt( p_intf, "key-jump-short" ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); } @@ -221,8 +348,9 @@ vlc_value_t val; intf_thread_t * p_intf = VLCIntf; val.i_int = config_GetInt( p_intf, "key-vol-up" ); - var_Set( p_intf->p_vlc, "key-pressed", val ); - [self updateVolumeSlider]; + var_Set( p_intf->p_libvlc, "key-pressed", val ); + /* Manage volume status */ + [o_main manageVolumeSlider]; } - (IBAction)volumeDown:(id)sender @@ -230,8 +358,9 @@ vlc_value_t val; intf_thread_t * p_intf = VLCIntf; val.i_int = config_GetInt( p_intf, "key-vol-down" ); - var_Set( p_intf->p_vlc, "key-pressed", val ); - [self updateVolumeSlider]; + var_Set( p_intf->p_libvlc, "key-pressed", val ); + /* Manage volume status */ + [o_main manageVolumeSlider]; } - (IBAction)mute:(id)sender @@ -239,97 +368,164 @@ vlc_value_t val; intf_thread_t * p_intf = VLCIntf; val.i_int = config_GetInt( p_intf, "key-vol-mute" ); - var_Set( p_intf->p_vlc, "key-pressed", val ); - [self updateVolumeSlider]; + var_Set( p_intf->p_libvlc, "key-pressed", val ); + /* Manage volume status */ + [o_main manageVolumeSlider]; } - (IBAction)volumeSliderUpdated:(id)sender { intf_thread_t * p_intf = VLCIntf; audio_volume_t i_volume = (audio_volume_t)[sender intValue]; - aout_VolumeSet( p_intf, i_volume * AOUT_VOLUME_STEP ); - [self updateVolumeSlider]; + 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 { - NSString * o_text; - intf_thread_t * p_intf = VLCIntf; - audio_volume_t 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 ); + } +} - aout_VolumeGet( p_intf, &i_volume ); +- (IBAction)toogleFullscreen:(id)sender { + NSMenuItem *o_mi = [[NSMenuItem alloc] initWithTitle: _NS("Fullscreen") action: nil keyEquivalent:@""]; + [self windowAction: [o_mi autorelease]]; +} - o_text = [NSString stringWithFormat: @"Volume: %d", i_volume * 200 / AOUT_VOLUME_MAX]; - [o_main setScrollField:o_text stopAfter:1000000]; - - [o_volumeslider setFloatValue: (float)(i_volume / AOUT_VOLUME_STEP)]; +- (BOOL) isFullscreen { + id o_vout_view = [self getVoutView]; + if( o_vout_view ) + { + return [o_vout_view isFullscreen]; + } + return NO; } - (IBAction)windowAction:(id)sender { - id o_window = [NSApp keyWindow]; NSString *o_title = [sender title]; - NSArray *o_windows = [NSApp orderedWindows]; - NSEnumerator *o_enumerator = [o_windows objectEnumerator]; - vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT, - FIND_ANYWHERE ); - playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, + vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT, FIND_ANYWHERE ); - if( p_vout != NULL ) { - while ((o_window = [o_enumerator nextObject])) + id o_vout_view = [self getVoutView]; + if( o_vout_view ) { - if( [[o_window className] isEqualToString: @"VLCWindow"] ) + 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") ] ) { - 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 if( [o_title isEqualToString: _NS("Snapshot") ] ) - { - [o_window snapshot]; - } - else - { - vlc_value_t val; - var_Get( p_vout, "fullscreen", &val ); - var_Set( p_vout, "fullscreen", (vlc_value_t)!val.b_bool ); - } - break; + 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 ); - if (p_playlist) vlc_object_release(p_playlist); } - - else if ( p_playlist != NULL ) + else { - if (! ([o_title isEqualToString: _NS("Half Size") ] || - [o_title isEqualToString: _NS("Normal Size") ] || - [o_title isEqualToString: _NS("Double Size") ] || - [o_title isEqualToString: _NS("Float on Top") ] || - [o_title isEqualToString: _NS("Fit to Screen") ] )) + playlist_t * p_playlist = pl_Yield( VLCIntf ); + + if( [o_title isEqualToString: _NS("Fullscreen")] || + [sender isKindOfClass:[NSButton class]] ) { vlc_value_t val; var_Get( p_playlist, "fullscreen", &val ); var_Set( p_playlist, "fullscreen", (vlc_value_t)!val.b_bool ); } - vlc_object_release( (vlc_object_t *)p_playlist ); + + vlc_object_release( p_playlist ); } } +- (void)scrollWheel:(NSEvent *)theEvent +{ + 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) + { + for (i = 0; i < (int)(f_xabsvalue/6.+1.) && f_xabsvalue > 0.05; i++) + var_SetInteger( p_intf->p_libvlc, "key-pressed", i_xvlckey ); + } +} + +- (BOOL)keyEvent:(NSEvent *)o_event +{ + BOOL eventHandled = NO; + unichar key = [[o_event charactersIgnoringModifiers] characterAtIndex: 0]; + + if( key ) + { + 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; +} + - (void)setupVarMenuItem:(NSMenuItem *)o_mi target:(vlc_object_t *)p_object var:(const char *)psz_variable @@ -350,7 +546,7 @@ /* Variable doesn't exist or isn't handled */ return; } - + /* Make sure we want to display the variable */ if( i_type & VLC_VAR_HASCHOICE ) { @@ -359,7 +555,7 @@ 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 ? @@ -372,7 +568,7 @@ [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; } @@ -485,7 +681,7 @@ 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 ]; @@ -512,7 +708,7 @@ 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 ); @@ -550,31 +746,103 @@ return VLC_EGENERIC; } +- (IBAction)goToSpecificTime:(id)sender +{ + if( sender == o_specificTime_cancel_btn ) + { + [NSApp endSheet: o_specificTime_win]; + [o_specificTime_win close]; + } + else if( sender == o_specificTime_ok_btn ) + { + input_thread_t * p_input = (input_thread_t *)vlc_object_find( VLCIntf, \ + VLC_OBJECT_INPUT, FIND_ANYWHERE ); + if( p_input ) + { + unsigned int timeInSec = 0; + NSString * fieldContent = [o_specificTime_enter_fld stringValue]; + if( [[fieldContent componentsSeparatedByString: @":"] count] > 1 && + [[fieldContent componentsSeparatedByString: @":"] count] <= 3 ) + { + NSArray * ourTempArray = \ + [fieldContent componentsSeparatedByString: @":"]; + + if( [[fieldContent componentsSeparatedByString: @":"] count] == 3 ) + { + 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]; + + 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]; + } + else + { + input_thread_t * p_input = (input_thread_t *)vlc_object_find( VLCIntf, \ + VLC_OBJECT_INPUT, FIND_ANYWHERE ); + if( p_input ) + { + /* 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 ); + } + } +} + +- (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; vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + playlist_t * p_playlist = pl_Yield( p_intf ); - 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 ) { - bEnabled = p_input->input.b_can_pace_control; + bEnabled = p_input->b_can_pace_control; } else { @@ -583,22 +851,17 @@ } 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; - } + /** \todo fix i_size use */ + bEnabled = p_playlist->items.i_size > 1; } else if( [[o_mi title] isEqualToString: _NS("Random")] ) { @@ -622,47 +885,49 @@ [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")]) { - bEnabled = FALSE; - if( p_playlist != NULL && p_input != NULL ) + if( p_input != NULL ) { var_Get( p_input, "seekable", &val); - if( val.b_bool ) - { - bEnabled = TRUE; - } + 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("Half Size")] || [[o_mi title] isEqualToString: _NS("Normal Size")] || [[o_mi title] isEqualToString: _NS("Double Size")] || [[o_mi title] isEqualToString: _NS("Fit to Screen")] || [[o_mi title] isEqualToString: _NS("Snapshot")] || + [[o_mi title] isEqualToString: _NS("Fullscreen")] || [[o_mi title] isEqualToString: _NS("Float on Top")] ) { id o_window; NSArray *o_windows = [NSApp orderedWindows]; NSEnumerator *o_enumerator = [o_windows objectEnumerator]; bEnabled = FALSE; - + vout_thread_t *p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE ); if( p_vout != NULL ) { - if ( [[o_mi title] isEqualToString: _NS("Float on Top")] ) + 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])) + while( (o_window = [o_enumerator nextObject])) { - if( [[o_window className] isEqualToString: @"VLCWindow"] ) + if( [[o_window className] isEqualToString: @"VLCVoutWindow"] || + [[[VLCMain sharedInstance] getEmbeddedList] + windowContainsEmbedded: o_window]) { bEnabled = TRUE; break; @@ -670,27 +935,17 @@ } vlc_object_release( (vlc_object_t *)p_vout ); } - } - else if( [[o_mi title] isEqualToString: _NS("Fullscreen")]) - { - if (p_playlist) + else if( [[o_mi title] isEqualToString: _NS("Fullscreen")] ) { - var_Get(p_playlist, "fullscreen", &val ); + var_Get( p_playlist, "fullscreen", &val ); [o_mi setState: val.b_bool]; bEnabled = TRUE; } - else - { - bEnabled = FALSE; - } + [o_main setupMenus]; /* Make sure video menu is up to date */ } - - if( p_playlist != NULL ) - { - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); - } + vlc_mutex_unlock( &p_playlist->object_lock ); + vlc_object_release( p_playlist ); return( bEnabled ); } @@ -698,7 +953,7 @@ @end /***************************************************************************** - * VLCMenuExt implementation + * VLCMenuExt implementation ***************************************************************************** * Object connected to a playlistitem which remembers the data belonging to * the variable of the autogenerated menu @@ -724,6 +979,7 @@ - (void)dealloc { free( psz_name ); + [super dealloc]; } - (char *)name @@ -747,3 +1003,18 @@ } @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