* intf.m: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
- * $Id: intf.m,v 1.94 2003/09/19 23:03:27 hartman Exp $
+ * $Id: intf.m,v 1.98 2003/11/03 15:27:28 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
#include <stdlib.h> /* malloc(), free() */
#include <sys/param.h> /* for MAXPATHLEN */
#include <string.h>
+#include <vlc_keys.h>
#include "intf.h"
#include "vout.h"
return VLC_SUCCESS;
}
+static struct
+{
+ unichar i_nskey;
+ int i_vlckey;
+} nskeys_to_vlckeys[] =
+{
+ { NSUpArrowFunctionKey, KEY_UP },
+ { NSDownArrowFunctionKey, KEY_DOWN },
+ { NSLeftArrowFunctionKey, KEY_LEFT },
+ { NSRightArrowFunctionKey, KEY_RIGHT },
+ { NSF1FunctionKey, KEY_F1 },
+ { NSF2FunctionKey, KEY_F2 },
+ { NSF3FunctionKey, KEY_F3 },
+ { NSF4FunctionKey, KEY_F4 },
+ { NSF5FunctionKey, KEY_F5 },
+ { NSF6FunctionKey, KEY_F6 },
+ { NSF7FunctionKey, KEY_F7 },
+ { NSF8FunctionKey, KEY_F8 },
+ { NSF9FunctionKey, KEY_F9 },
+ { NSF10FunctionKey, KEY_F10 },
+ { NSF11FunctionKey, KEY_F11 },
+ { NSF12FunctionKey, KEY_F12 },
+ { NSHomeFunctionKey, KEY_HOME },
+ { NSEndFunctionKey, KEY_END },
+ { NSPageUpFunctionKey, KEY_PAGEUP },
+ { NSPageDownFunctionKey, KEY_PAGEDOWN },
+ { NSTabCharacter, KEY_TAB },
+ { NSCarriageReturnCharacter, KEY_ENTER },
+ { NSEnterCharacter, KEY_ENTER },
+ { NSBackspaceCharacter, KEY_BACKSPACE },
+ { (unichar) ' ', KEY_SPACE },
+ { (unichar) 0x1b, KEY_ESC },
+ {0,0}
+};
+
+int CocoaConvertKey( unichar i_key )
+{
+ int i;
+
+ for( i = 0; nskeys_to_vlckeys[i].i_nskey != 0; i++ )
+ {
+ if( nskeys_to_vlckeys[i].i_nskey == i_key )
+ {
+ return nskeys_to_vlckeys[i].i_vlckey;
+ }
+ }
+ return (int)i_key;
+}
+
/*****************************************************************************
* VLCMain implementation
*****************************************************************************/
[o_mi_slower setTitle: _NS("Slower")];
[o_mi_previous setTitle: _NS("Previous")];
[o_mi_next setTitle: _NS("Next")];
- [o_mi_loop setTitle: _NS("Loop")];
+ [o_mi_random setTitle: _NS("Shuffle")];
+ [o_mi_repeat setTitle: _NS("Repeat Item")];
+ [o_mi_loop setTitle: _NS("Repeat Playlist")];
[o_mi_fwd setTitle: _NS("Step Forward")];
[o_mi_bwd setTitle: _NS("Step Backward")];
[o_mi_program setTitle: _NS("Program")];
[o_mu_channels setTitle: _NS("Audio channels")];
[o_mi_device setTitle: _NS("Audio device")];
[o_mu_device setTitle: _NS("Audio device")];
+ [o_mi_visual setTitle: _NS("Visualizations")];
+ [o_mu_visual setTitle: _NS("Visualizations")];
[o_mu_video setTitle: _NS("Video")];
[o_mi_half_window setTitle: _NS("Half Size")];
if( p_playlist != NULL )
{
var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
- vlc_mutex_lock( &p_playlist->object_lock );
-
- [self manage: p_playlist];
+#define p_input p_playlist->p_input
+
+ if( p_input )
+ {
+ if( !p_input->b_die )
+ {
+ vlc_value_t val;
+
+ /* New input or stream map change */
+ if( p_input->stream.b_changed )
+ {
+ msg_Dbg( p_intf, "stream has changed, refreshing interface" );
+ p_intf->p_sys->b_playing = TRUE;
+ p_intf->p_sys->b_current_title_update = 1;
+ p_input->stream.b_changed = 0;
+ p_intf->p_sys->b_intf_update = TRUE;
+ }
+
+ if( var_Get( (vlc_object_t *)p_input, "intf-change", &val )
+ >= 0 && val.b_bool )
+ {
+ p_intf->p_sys->b_input_update = TRUE;
+ }
+ }
+ }
+ else if( p_intf->p_sys->b_playing && !p_intf->b_die )
+ {
+ p_intf->p_sys->b_playing = FALSE;
+ p_intf->p_sys->b_intf_update = TRUE;
+ }
- vlc_mutex_unlock( &p_playlist->object_lock );
+#undef p_input
vlc_object_release( p_playlist );
}
}
[self terminate];
-
[o_pool release];
}
-- (void)manage:(playlist_t *)p_playlist
-{
- intf_thread_t * p_intf = [NSApp getIntf];
-
-#define p_input p_playlist->p_input
-
- if( p_input )
- {
- vlc_mutex_lock( &p_input->stream.stream_lock );
-
- if( !p_input->b_die )
- {
- /* New input or stream map change */
- if( p_input->stream.b_changed )
- {
- p_intf->p_sys->b_playing = TRUE;
- [self manageMode: p_playlist];
- }
-
- vlc_value_t val;
-
- if( var_Get( (vlc_object_t *)p_input, "intf-change", &val )
- >= 0 && val.b_bool )
- {
- p_intf->p_sys->b_input_update = TRUE;
- }
- }
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- }
- else if( p_intf->p_sys->b_playing && !p_intf->b_die )
- {
- p_intf->p_sys->b_playing = FALSE;
- [self manageMode: p_playlist];
- }
-
-#undef p_input
-}
-
-- (void)manageMode:(playlist_t *)p_playlist
-{
- intf_thread_t * p_intf = [NSApp getIntf];
-
- if( p_playlist->p_input != NULL )
- {
- p_intf->p_sys->b_current_title_update = 1;
- p_playlist->p_input->stream.b_changed = 0;
-
- msg_Dbg( p_intf, "stream has changed, refreshing interface" );
- }
-
- p_intf->p_sys->b_intf_update = VLC_TRUE;
-}
-
- (void)manageIntf:(NSTimer *)o_timer
{
intf_thread_t * p_intf = [NSApp getIntf];
vlc_bool_t b_control = VLC_FALSE;
vlc_bool_t b_seekable = VLC_FALSE;
vlc_bool_t b_chapters = VLC_FALSE;
+ vlc_value_t val;
b_plmul = p_playlist->i_size > 1;
/* chapters & titles */
b_chapters = p_input->stream.i_area_nb > 1;
+
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
/* play status */
- p_intf->p_sys->b_play_status =
- p_input->stream.control.i_status != PAUSE_S;
-
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+ var_Get( p_input, "state", &val );
+ p_intf->p_sys->b_play_status = val.i_int != PAUSE_S;
}
else
{
p_intf->p_sys->b_intf_update = VLC_FALSE;
}
-
-#define p_area p_input->stream.p_selected_area
if( p_intf->p_sys->b_playing && p_input != NULL )
{
- vlc_bool_t b_field_update = TRUE;
- vlc_mutex_lock( &p_input->stream.stream_lock );
-
+ vlc_value_t time, val;
+ NSString * o_time;
+ mtime_t i_seconds;
+ var_Get( p_input, "state", &val );
+
if( !p_input->b_die && ( p_intf->p_sys->b_play_status !=
- ( p_input->stream.control.i_status != PAUSE_S ) ) )
+ ( val.i_int != PAUSE_S ) ) )
{
p_intf->p_sys->b_play_status =
!p_intf->p_sys->b_play_status;
if( p_input->stream.b_seekable )
{
- if( f_slider == f_slider_old )
- {
- float f_updated = ( 10000. * p_area->i_tell ) /
- p_area->i_size;
+ vlc_value_t pos;
+ float f_updated;
+
+ var_Get( p_input, "position", &pos );
+ f_updated = 10000. * pos.f_float;
- if( f_slider != f_updated )
- {
- [o_timeslider setFloatValue: f_updated];
- }
- }
- else
+ if( f_slider != f_updated )
{
- off_t i_seek = ( f_slider * p_area->i_size ) / 10000;
-
- /* release the lock to be able to seek */
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- vlc_mutex_unlock( &p_playlist->object_lock );
- playlist_Play( p_playlist );
- input_Seek( p_input, i_seek, INPUT_SEEK_SET );
- vlc_mutex_lock( &p_playlist->object_lock );
- vlc_mutex_lock( &p_input->stream.stream_lock );
-
- /* update the old value */
- f_slider_old = f_slider;
-
- b_field_update = VLC_FALSE;
+ [o_timeslider setFloatValue: f_updated];
}
}
-
- if( b_field_update )
- {
- NSString * o_time;
- char psz_time[ OFFSETTOTIME_MAX_SIZE ];
-
- input_OffsetToTime( p_input, psz_time, p_area->i_tell );
-
- o_time = [NSString stringWithUTF8String: psz_time];
- [o_timefield setStringValue: o_time];
- }
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+
+ var_Get( p_input, "time", &time );
+ i_seconds = time.i_time / 1000000;
+
+ o_time = [NSString stringWithFormat: @"%d:%02d:%02d",
+ (int) (i_seconds / (60 * 60)),
+ (int) (i_seconds / 60 % 60),
+ (int) (i_seconds % 60)];
+ [o_timefield setStringValue: o_time];
/* disable screen saver */
UpdateSystemActivity( UsrActivity );
}
-#undef p_area
-
- if( p_input != NULL )
- {
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- }
-
#undef p_input
vlc_mutex_unlock( &p_playlist->object_lock );
[o_controls setupVarMenuItem: o_mi_device target: (vlc_object_t *)p_aout
var: "audio-device" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_visual target: (vlc_object_t *)p_aout
+ var: "visual" selector: @selector(toggleVar:)];
vlc_object_release( (vlc_object_t *)p_aout );
}
- (IBAction)timesliderUpdate:(id)sender
{
+ intf_thread_t * p_intf;
+ input_thread_t * p_input;
float f_updated;
switch( [[NSApp currentEvent] type] )
{
case NSLeftMouseUp:
case NSLeftMouseDown:
- f_slider = [sender floatValue];
- return;
-
case NSLeftMouseDragged:
f_updated = [sender floatValue];
break;
return;
}
- intf_thread_t * p_intf = [NSApp getIntf];
+ p_intf = [NSApp getIntf];
+ p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
+ FIND_ANYWHERE );
- 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 );
-
- if( p_playlist->p_input != NULL )
+ if( p_input != NULL )
{
- off_t i_tell;
+ vlc_value_t time;
+ mtime_t i_seconds;
NSString * o_time;
- char psz_time[ OFFSETTOTIME_MAX_SIZE ];
-
-#define p_area p_playlist->p_input->stream.p_selected_area
- vlc_mutex_lock( &p_playlist->p_input->stream.stream_lock );
- i_tell = f_updated / 10000. * p_area->i_size;
- input_OffsetToTime( p_playlist->p_input, psz_time, i_tell );
- vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
-#undef p_area
- o_time = [NSString stringWithUTF8String: psz_time];
- [o_timefield setStringValue: o_time];
+ if( p_input->stream.b_seekable )
+ {
+ vlc_value_t pos;
+ pos.f_float = f_updated / 10000.;
+ if( f_slider != f_updated )
+ {
+ var_Set( p_input, "position", pos );
+ [o_timeslider setFloatValue: f_updated];
+ }
+ }
+
+ var_Get( p_input, "time", &time );
+ i_seconds = time.i_time / 1000000;
+
+ o_time = [NSString stringWithFormat: @"%d:%02d:%02d",
+ (int) (i_seconds / (60 * 60)),
+ (int) (i_seconds / 60 % 60),
+ (int) (i_seconds % 60)];
+ [o_timefield setStringValue: o_time];
+ vlc_object_release( p_input );
}
-
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
}
- (void)terminate
{
NSEvent * o_event;
- vout_thread_t * p_vout;
playlist_t * p_playlist;
intf_thread_t * p_intf = [NSApp getIntf];
playlist_Destroy( p_playlist );
}
- /*
- * Free video outputs
- */
- msg_Dbg( p_intf, "removing all video outputs" );
- while( (p_vout = vlc_object_find( p_intf->p_vlc,
- VLC_OBJECT_VOUT, FIND_CHILD )) )
- {
- vlc_object_detach( p_vout );
- vlc_object_release( p_vout );
- vout_Destroy( p_vout );
- }
-
if( o_img_pause != nil )
{
[o_img_pause release];
projects / vlc / blobdiff