/*****************************************************************************
* controls.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
+ * Copyright (C) 2002-2005 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
* Derk-Jan Hartman <hartman at videolan dot org>
+ * Benjamin Pracht <bigben at videolan doit 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
*
* 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 "vout.h"
#include "open.h"
#include "controls.h"
-#include <osd.h>
+#include <vlc_osd.h>
+
/*****************************************************************************
* 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;
{
vlc_mutex_unlock( &p_playlist->object_lock );
vlc_object_release( p_playlist );
- [o_open openFileGeneric: nil];
+ [o_main intfOpenFileGeneric: (id)sender];
}
else
{
}
val.i_int = config_GetInt( p_intf, "key-play-pause" );
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ 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] )
+ {
+ o_vout_view = [o_embedded_vout_list getViewForWindow: o_window];
+ }
+ /* We have a detached vout */
+ else if( [[o_window className] isEqualToString: @"VLCWindow"] )
+ {
+ msg_Dbg( VLCIntf, "detached vout controls.m call getVoutView" );
+ o_vout_view = [o_window getVoutView];
+ }
+ }
+ 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
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
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
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
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
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 );
}
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 );
}
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 );
}
{
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 );
}
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
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
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 );
-}
-
-- (void)updateVolumeSlider
-{
- intf_thread_t * p_intf = VLCIntf;
- audio_volume_t i_volume;
-
- aout_VolumeGet( p_intf, &i_volume );
-
- [o_volumeslider setFloatValue: (float)(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];
}
- (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];
+ else if( [o_title isEqualToString: _NS("Normal Size") ] )
+ [o_vout_view scaleWindowWithFactor: 1.0];
+ else if( [o_title isEqualToString: _NS("Double Size") ] )
+ [o_vout_view scaleWindowWithFactor: 2.0];
+ 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 = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+
+ if( p_playlist && ( [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 );
+ if( p_playlist ) vlc_object_release( (vlc_object_t *)p_playlist );
}
}
+- (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
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;
}
}
-
+
/* 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 );
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_mutex_lock( &p_playlist->object_lock );
}
+ else return FALSE;
#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;
}
}
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;
- }
}
else if( [[o_mi title] isEqualToString: _NS("Random")] )
{
[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;
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: @"VLCWindow"] ||
+ [[[VLCMain sharedInstance] getEmbeddedList]
+ windowContainsEmbedded: o_window])
{
bEnabled = TRUE;
break;
}
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 );
}
- (void)dealloc
{
free( psz_name );
+ [super dealloc];
}
- (char *)name
}
@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