/*****************************************************************************
- * controls.m: MacOS X interface plugin
+ * controls.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
- * $Id: controls.m,v 1.38 2003/05/11 18:41:27 hartman Exp $
+ * Copyright (C) 2002-2007 the VideoLAN team
+ * $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
- * Derk-Jan Hartman <thedj@users.sourceforge.net>
+ * Derk-Jan Hartman <hartman at videolan dot org>
+ * Benjamin Pracht <bigben at videolan doit org>
+ * Felix Kühne <fkuehne at videolan dot org>
*
* 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
*
* 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.
*****************************************************************************/
/*****************************************************************************
#include <sys/param.h> /* for MAXPATHLEN */
#include <string.h>
-#include "intf.h"
-#include "vout.h"
-#include "open.h"
-#include "controls.h"
+#import "intf.h"
+#import "vout.h"
+#import "open.h"
+#import "controls.h"
+#import "playlist.h"
+#include <vlc_osd.h>
+#include <vlc_keys.h>
/*****************************************************************************
- * VLCControls implementation
+ * VLCControls implementation
*****************************************************************************/
@implementation VLCControls
-- (IBAction)play:(id)sender
+- (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")];
+
+ o_repeat_off = [NSImage imageNamed:@"repeat_embedded"];
+
+ [self controlTintChanged];
+
+ [[NSNotificationCenter defaultCenter] addObserver: self
+ selector: @selector( controlTintChanged )
+ name: NSControlTintDidChangeNotification
+ object: nil];
+}
+
+- (void)controlTintChanged
{
- intf_thread_t * p_intf = [NSApp getIntf];
+ 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;
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist == NULL )
+ if( [NSColor currentControlTint] == NSGraphiteControlTint )
{
- return;
+ 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];
+}
- if( playlist_IsPlaying( p_playlist ) )
+- (void)dealloc
+{
+ [[NSNotificationCenter defaultCenter] removeObserver: self];
+
+ [o_repeat_single release];
+ [o_repeat_all release];
+ [o_repeat_off release];
+
+ [super dealloc];
+}
+
+- (IBAction)play:(id)sender
+{
+ vlc_value_t val;
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = pl_Yield( p_intf );
+
+ vlc_object_lock( p_playlist );
+ if( playlist_IsEmpty( p_playlist ) )
{
- playlist_Pause( p_playlist );
+ vlc_object_unlock( p_playlist );
vlc_object_release( p_playlist );
+ [o_main intfOpenFileGeneric: (id)sender];
}
else
{
- if( !playlist_IsEmpty( p_playlist ) )
+ vlc_object_unlock( p_playlist );
+ 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] )
{
- 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 openFileGeneric: 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];
+ 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 );
+ /* Close the window directly, because we do know that there
+ * won't be anymore video. It's currently waiting a bit. */
+ [[[self getVoutView] window] orderOut:self];
+}
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist == NULL )
- {
- return;
- }
+- (IBAction)faster:(id)sender
+{
+ 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 );
+}
- playlist_Stop( p_playlist );
- vlc_object_release( p_playlist );
+- (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 );
}
-- (IBAction)faster:(id)sender
+- (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)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_FASTER );
- }
- vlc_mutex_unlock( &p_playlist->object_lock );
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Random Off" ) );
+ config_PutInt( p_playlist, "random", 0 );
+ }
+ p_intf->p_sys->b_playmode_update = true;
+ p_intf->p_sys->b_intf_update = true;
vlc_object_release( p_playlist );
}
-- (IBAction)slower:(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
+{
+ [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 );
+}
+
+- (IBAction)repeatButtonAction:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
+ vlc_value_t looping,repeating;
+ 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, "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 = true;
+ looping.b_bool = 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->object_lock );
- if( p_playlist->p_input != NULL )
+ else if( repeating.b_bool && !looping.b_bool )
{
- input_SetStatus( p_playlist->p_input, INPUT_STATUS_SLOWER );
+ /* was: Repeat One, switching to Repeat All */
+
+ /* set our button's look */
+ [self repeatAll];
+
+ /* prepare core communication */
+ repeating.b_bool = false;
+ looping.b_bool = 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 = false;
+ looping.b_bool = false;
+ config_PutInt( p_playlist, "repeat", 0 );
+ config_PutInt( p_playlist, "loop", 0 );
+
+ /* show the change */
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat Off" ) );
}
- vlc_mutex_unlock( &p_playlist->object_lock );
+
+ /* 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 = true;
+ p_intf->p_sys->b_intf_update = true;
vlc_object_release( p_playlist );
}
-- (IBAction)prev:(id)sender
+
+- (IBAction)repeat:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
+ vlc_value_t val;
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = 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, "repeat", &val );
+ if (!val.b_bool)
{
- return;
+ var_Set( p_playlist, "loop", val );
}
-
- vlc_mutex_lock( &p_playlist->object_lock );
-
- if( p_playlist->p_input == NULL )
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "repeat", val );
+ if( val.b_bool )
{
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
- return;
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat One" ) );
+ config_PutInt( p_playlist, "repeat", 1 );
}
-
- 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
{
- p_area->i_part--;
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat Off" ) );
+ config_PutInt( p_playlist, "repeat", 0 );
+ }
+
+ p_intf->p_sys->b_playmode_update = true;
+ p_intf->p_sys->b_intf_update = true;
+ vlc_object_release( p_playlist );
+}
- 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 );
+- (IBAction)loop:(id)sender
+{
+ vlc_value_t val;
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = pl_Yield( p_intf );
- p_intf->p_sys->b_input_update = VLC_TRUE;
+ 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, DEFAULT_CHAN, _( "Repeat All" ) );
+ config_PutInt( p_playlist, "loop", 1 );
}
else
{
- vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
- vlc_mutex_unlock( &p_playlist->object_lock );
- playlist_Prev( p_playlist );
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat Off" ) );
+ config_PutInt( p_playlist, "loop", 0 );
}
-#undef p_area
-
+ p_intf->p_sys->b_playmode_update = true;
+ p_intf->p_sys->b_intf_update = true;
vlc_object_release( p_playlist );
}
-- (IBAction)next:(id)sender
+- (IBAction)forward:(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-jump+short" );
+ 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 )
- {
- return;
- }
+- (IBAction)backward:(id)sender
+{
+ 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 );
+}
- vlc_mutex_lock( &p_playlist->object_lock );
- if( p_playlist->p_input == NULL )
+- (IBAction)volumeUp:(id)sender
+{
+ 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
+{
+ 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
+{
+ 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 = VLCIntf;
+ audio_volume_t i_volume = (audio_volume_t)[sender intValue];
+ 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];
+}
+
+- (IBAction)showPosition: (id)sender
+{
+ vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT,
+ FIND_ANYWHERE );
+ if( p_vout != NULL )
{
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
- return;
+ 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 );
}
+}
- vlc_mutex_lock( &p_playlist->p_input->stream.stream_lock );
-
-#define p_area p_playlist->p_input->stream.p_selected_area
+- (IBAction)toogleFullscreen:(id)sender {
+ NSMenuItem *o_mi = [[NSMenuItem alloc] initWithTitle: _NS("Fullscreen") action: nil keyEquivalent:@""];
+ [self windowAction: [o_mi autorelease]];
+}
- if( p_area->i_part_nb > 1 && p_area->i_part + 1 < p_area->i_part_nb )
+- (BOOL) isFullscreen {
+ id o_vout_view = [self getVoutView];
+ if( o_vout_view )
{
- p_area->i_part++;
+ return [o_vout_view isFullscreen];
+ }
+ return NO;
+}
- 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 );
+- (IBAction)windowAction:(id)sender
+{
+ NSString *o_title = [sender title];
- p_intf->p_sys->b_input_update = VLC_TRUE;
+ vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT,
+ FIND_ANYWHERE );
+ if( p_vout != NULL )
+ {
+ id o_vout_view = [self getVoutView];
+ if( o_vout_view )
+ {
+ 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
+ {
+ playlist_t * p_playlist = pl_Yield( VLCIntf );
+ /* Fullscreen state for next time will be saved here too */
+ [o_vout_view toggleFullscreen];
+ }
+ }
+ vlc_object_release( (vlc_object_t *)p_vout );
}
else
{
- vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
- vlc_mutex_unlock( &p_playlist->object_lock );
- playlist_Next( p_playlist );
- }
+ playlist_t * p_playlist = pl_Yield( VLCIntf );
-#undef p_area
+ 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 );
+ }
+
+ pl_Release( VLCIntf );
+ }
- vlc_object_release( p_playlist );
}
-- (IBAction)loop:(id)sender
+- (void)scrollWheel:(NSEvent *)theEvent
{
- intf_thread_t * p_intf = [NSApp getIntf];
+ 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;
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist == NULL )
+ /* 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)
{
- return;
+ for (i = 0; i < (int)(f_xabsvalue/6.+1.) && f_xabsvalue > 0.05; i++)
+ var_SetInteger( p_intf->p_libvlc, "key-pressed", i_xvlckey );
}
+}
- config_PutInt( p_playlist, "loop",
- !config_GetInt( p_playlist, "loop" ) );
+- (BOOL)keyEvent:(NSEvent *)o_event
+{
+ BOOL eventHandled = NO;
+ unichar key = [[o_event charactersIgnoringModifiers] characterAtIndex: 0];
- vlc_object_release( p_playlist );
+ 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;
}
-- (IBAction)forward:(id)sender
+- (void)setupVarMenuItem:(NSMenuItem *)o_mi
+ target:(vlc_object_t *)p_object
+ var:(const char *)psz_variable
+ selector:(SEL)pf_callback
{
- 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 )
+ vlc_value_t val, text;
+ int i_type = var_Type( p_object, psz_variable );
+
+ switch( i_type & VLC_VAR_TYPE )
{
- if ( p_playlist != NULL ) vlc_object_release( p_playlist );
+ 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 ) ]];
- input_Seek( p_playlist->p_input, 5, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
- vlc_object_release( p_playlist );
-}
+ var_Get( p_object, psz_variable, &val );
+ if( i_type & VLC_VAR_HASCHOICE )
+ {
+ NSMenu *o_menu = [o_mi submenu];
-- (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 )
+ [self setupVarMenu: o_menu forMenuItem: o_mi target:p_object
+ var:psz_variable selector:pf_callback];
+
+ free( text.psz_string );
+ return;
+ }
+
+ VLCMenuExt *o_data;
+ switch( i_type & VLC_VAR_TYPE )
{
- if ( p_playlist != NULL ) vlc_object_release( p_playlist );
+ 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:
+ free( text.psz_string );
return;
}
- input_Seek( p_playlist->p_input, -5, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
- vlc_object_release( p_playlist );
+ if( ( i_type & VLC_VAR_TYPE ) == VLC_VAR_STRING ) free( val.psz_string );
+ free( text.psz_string );
}
-- (IBAction)volumeUp:(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
{
- intf_thread_t * p_intf = [NSApp getIntf];
+ vlc_value_t val, val_list, text_list;
+ int i_type, i, i_nb_items;
- if( p_intf->p_sys->b_mute )
+ /* remove previous items */
+ i_nb_items = [o_menu numberOfItems];
+ for( i = 0; i < i_nb_items; i++ )
{
- [self mute: nil];
+ [o_menu removeItemAtIndex: 0];
}
- aout_VolumeUp( p_intf, 1, NULL );
+ /* Check the type of the object variable */
+ i_type = var_Type( p_object, psz_variable );
- [self updateVolumeSlider];
-}
+ /* 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
+ {
+ return;
+ }
-- (IBAction)volumeDown:(id)sender
-{
- intf_thread_t * p_intf = [NSApp getIntf];
+ 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;
+ }
- if( p_intf->p_sys->b_mute )
+ if( var_Get( p_object, psz_variable, &val ) < 0 )
{
- [self mute: nil];
+ return;
}
-
- aout_VolumeDown( p_intf, 1, NULL );
- [self updateVolumeSlider];
-}
+ if( var_Change( p_object, psz_variable, VLC_VAR_GETLIST,
+ &val_list, &text_list ) < 0 )
+ {
+ if( (i_type & VLC_VAR_TYPE) == VLC_VAR_STRING ) free( val.psz_string );
+ return;
+ }
-- (IBAction)mute:(id)sender
-{
- intf_thread_t * p_intf = [NSApp getIntf];
- audio_volume_t i_volume;
+ /* make (un)sensitive */
+ [o_parent setEnabled: ( val_list.p_list->i_count > 1 )];
+
+ for( i = 0; i < val_list.p_list->i_count; i++ )
+ {
+ vlc_value_t another_val;
+ NSMenuItem * o_lmi;
+ NSString *o_title = @"";
+ VLCMenuExt *o_data;
+
+ 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;
- aout_VolumeMute( p_intf, &i_volume );
- p_intf->p_sys->b_mute = ( i_volume == 0 );
+ case VLC_VAR_INTEGER:
- [self updateVolumeSlider];
+ 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;
+ }
+ }
+
+ /* 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)volumeSliderUpdated:(id)sender
+- (IBAction)toggleVar:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
- audio_volume_t i_volume = (audio_volume_t)[sender intValue];
+ NSMenuItem *o_mi = (NSMenuItem *)sender;
+ VLCMenuExt *o_data = [[o_mi representedObject] pointerValue];
+ [NSThread detachNewThreadSelector: @selector(toggleVarThread:)
+ toTarget: self withObject: o_data];
- aout_VolumeSet( p_intf, i_volume * AOUT_VOLUME_STEP );
+ return;
}
-- (void)updateVolumeSlider
+- (int)toggleVarThread: (id)_o_data
{
- intf_thread_t * p_intf = [NSApp getIntf];
- audio_volume_t i_volume;
+ 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 );
- aout_VolumeGet( p_intf, &i_volume );
+ p_object = (vlc_object_t *)vlc_object_get( [o_data objectID] );
- [o_volumeslider setFloatValue: (float)(i_volume / AOUT_VOLUME_STEP)];
+ if( p_object != NULL )
+ {
+ var_Set( p_object, strdup([o_data name]), [o_data value] );
+ vlc_object_release( p_object );
+ [o_pool release];
+ return true;
+ }
+ [o_pool release];
+ return VLC_EGENERIC;
}
-- (IBAction)windowAction:(id)sender
+- (IBAction)goToSpecificTime:(id)sender
{
- id o_window = [NSApp keyWindow];
- NSString *o_title = [sender title];
- NSArray *o_windows = [NSApp windows];
- NSEnumerator *o_enumerator = [o_windows objectEnumerator];
- vout_thread_t *p_vout = vlc_object_find( [NSApp getIntf], VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
-
- if( p_vout != NULL )
+ if( sender == o_specificTime_cancel_btn )
{
- while ((o_window = [o_enumerator nextObject]))
+ [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 )
{
- if( [[o_window className] isEqualToString: @"VLCWindow"] )
+ unsigned int timeInSec = 0;
+ NSString * fieldContent = [o_specificTime_enter_fld stringValue];
+ if( [[fieldContent componentsSeparatedByString: @":"] count] > 1 &&
+ [[fieldContent componentsSeparatedByString: @":"] count] <= 3 )
{
- if( [o_title isEqualToString: _NS("Fullscreen") ] )
- [o_window toggleFullscreen];
- else if( [o_title isEqualToString: _NS("Half Size") ] )
- [o_window scaleWindowWithFactor: 0.5];
- else if( [o_title isEqualToString: _NS("Normal Size") ] )
- [o_window scaleWindowWithFactor: 1.0];
- else if( [o_title isEqualToString: _NS("Double Size") ] )
- [o_window scaleWindowWithFactor: 2.0];
- else if( [o_title isEqualToString: _NS("Float On Top") ] )
- [o_window toggleFloatOnTop];
- else if( [o_title isEqualToString: _NS("Fit To Screen") ] )
+ 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
{
- if( ![o_window isZoomed] )
- [o_window performZoom:self];
+ timeInSec += ([[ourTempArray objectAtIndex: 0] intValue] * 60); //m
+ timeInSec += [[ourTempArray objectAtIndex: 1] intValue]; //s
}
}
- }
- vlc_object_release( (vlc_object_t *)p_vout );
- }
-}
-
-- (IBAction)deinterlace:(id)sender
-{
- intf_thread_t * p_intf = [NSApp getIntf];
- BOOL bEnable = [sender state] == NSOffState;
+ else
+ timeInSec = [fieldContent intValue];
- if( bEnable && ![[sender title] isEqualToString: @"none"] )
- {
- config_PutPsz( p_intf, "filter", "deinterlace" );
- config_PutPsz( p_intf, "deinterlace-mode",
- [[sender title] lossyCString] );
+ 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
{
- config_PutPsz( p_intf, "filter", NULL );
+ 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 );
+ }
}
}
-- (IBAction)toggleVar:(id)sender
+- (id)getFSPanel
{
- NSMenuItem *o_mi = (NSMenuItem *)sender;
- NSMenu *o_mu = [o_mi menu];
-
- if( [o_mi state] == NSOffState )
+ if( o_fs_panel )
+ return o_fs_panel;
+ else
{
- const char * psz_variable = (const char *)
- [[[o_mu supermenu] itemWithTitle: [o_mu title]] tag];
- vlc_object_t * p_object = (vlc_object_t *)
- [[o_mi representedObject] pointerValue];
- vlc_value_t val;
- val.i_int = (int)[o_mi tag];
-
- if ( var_Set( p_object, psz_variable, val ) < 0 )
- {
- msg_Warn( p_object, "cannot set variable %s: with %d", psz_variable, val.i_int );
- }
+ 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];
-
- 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 );
- }
-
-#define p_input p_playlist->p_input
+ vlc_value_t val;
+ intf_thread_t * p_intf = VLCIntf;
+ playlist_t * p_playlist = pl_Yield( p_intf );
+ input_thread_t * p_input = playlist_CurrentInput( p_playlist );
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
{
}
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 */
+ PL_LOCK;
+ bEnabled = p_playlist->items.i_size > 1;
+ PL_UNLOCK;
}
- 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("Fit To Screen")] ||
- [[o_mi title] isEqualToString: _NS("Float On Top")] )
+ [[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;
-
- if ( [[o_mi title] isEqualToString: _NS("Float On Top")] )
- {
- int i_state = config_GetInt( p_playlist, "macosx-float" ) ?
- NSOnState : NSOffState;
- [o_mi setState: i_state];
- }
-
+
vout_thread_t *p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
FIND_ANYWHERE );
if( p_vout != NULL )
{
- while ((o_window = [o_enumerator nextObject]))
+ 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]))
{
- if( [[o_window className] isEqualToString: @"VLCWindow"] )
+ 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_mi title] isEqualToString: _NS("Float On Top")] )
- {
-
- bEnabled = TRUE;
- }
- else if( o_menu != nil &&
- [[o_menu title] isEqualToString: _NS("Deinterlace")] )
- {
- char * psz_filter = config_GetPsz( p_intf, "filter" );
-
- if( psz_filter != NULL )
+ if( [[o_mi title] isEqualToString: _NS("Fullscreen")] )
{
- free( psz_filter );
-
- psz_filter = config_GetPsz( p_intf, "deinterlace-mode" );
+ 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 */
+ }
- if( psz_filter != NULL )
- {
- if( strcmp( psz_filter, [[o_mi title] lossyCString] ) == 0 )
- {
- [o_mi setState: NSOnState];
- }
- else
- {
- [o_mi setState: NSOffState];
- }
+ if( p_input ) vlc_object_release( p_input );
+ vlc_object_release( p_playlist );
- free( psz_filter );
- }
- else
- {
- if( [[o_mi title] isEqualToString: @"none"] )
- {
- [o_mi setState: NSOnState];
- }
- else
- {
- [o_mi setState: NSOffState];
- }
- }
- }
+ return( bEnabled );
+}
- if( p_playlist != NULL )
+@end
+
+/*****************************************************************************
+ * VLCMenuExt implementation
+ *****************************************************************************
+ * Object connected to a playlistitem which remembers the data belonging to
+ * the variable of the autogenerated menu
+ *****************************************************************************/
+@implementation VLCMenuExt
+
+- (id)initWithVar: (const char *)_psz_name Object: (int)i_id
+ Value: (vlc_value_t)val ofType: (int)_i_type
+{
+ self = [super init];
+
+ if( self != nil )
{
- 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
projects / vlc / blobdiff