#include <stdlib.h> /* malloc(), free() */
#include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include <vlc/input.h>
-#include <vlc/vout.h>
-#include <vlc/aout.h>
+#include <vlc_interface.h>
+#include <vlc_input.h>
+#include <vlc_vout.h>
+#include <vlc_aout.h>
#include <vlc_osd.h>
-
+#include <vlc_playlist.h>
#include "vlc_keys.h"
#define BUFFER_SIZE 10
static int Open( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
+ MALLOC_ERR( p_intf->p_sys, intf_sys_t );
- /* Allocate instance and initialize some members */
- p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
- if( p_intf->p_sys == NULL )
- {
- msg_Err( p_intf, "out of memory" );
- return 1;
- }
vlc_mutex_init( p_intf, &p_intf->p_sys->change_lock );
p_intf->p_sys->i_size = 0;
p_intf->pf_run = Run;
- p_intf->p_sys->p_input = NULL;
- p_intf->p_sys->p_vout = NULL;
-
var_AddCallback( p_intf->p_libvlc, "key-pressed", KeyEvent, p_intf );
- return 0;
+ return VLC_SUCCESS;
}
/*****************************************************************************
intf_thread_t *p_intf = (intf_thread_t *)p_this;
var_DelCallback( p_intf->p_libvlc, "key-pressed", KeyEvent, p_intf );
- if( p_intf->p_sys->p_input )
- {
- vlc_object_release( p_intf->p_sys->p_input );
- }
- if( p_intf->p_sys->p_vout )
- {
- vlc_object_release( p_intf->p_sys->p_vout );
- }
+
+ vlc_mutex_destroy( &p_intf->p_sys->change_lock );
/* Destroy structure */
free( p_intf->p_sys );
}
*****************************************************************************/
static void Run( intf_thread_t *p_intf )
{
- playlist_t *p_playlist = NULL;
input_thread_t *p_input = NULL;
vout_thread_t *p_vout = NULL;
vout_thread_t *p_last_vout = NULL;
struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
vlc_value_t val;
int i;
+ playlist_t *p_playlist = pl_Yield( p_intf );
/* Initialize hotkey structure */
for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
var_Set( p_intf->p_libvlc, p_hotkeys[i].psz_action, val );
}
- while( !p_intf->b_die )
+ while( !intf_ShouldDie( p_intf ) )
{
int i_key, i_action;
int i_times = 0;
/* Sleep a bit */
- msleep( INTF_IDLE_SLEEP );
+// msleep( INTF_IDLE_SLEEP );
- /* Update the input */
- if( p_intf->p_sys->p_input == NULL )
- {
- p_playlist = pl_Yield( p_intf );
- p_intf->p_sys->p_input = p_playlist->p_input;
- if( p_intf->p_sys->p_input )
- vlc_object_yield( p_intf->p_sys->p_input );
- vlc_object_release( p_playlist );
- }
- else if( p_intf->p_sys->p_input->b_dead )
+ i_action = 0;
+ i_key = GetKey( p_intf );
+
+ /* Special action for mouse event */
+ /* FIXME: This should probably be configurable */
+ /* FIXME: rework hotkeys handling to allow more than 1 event
+ * to trigger one same action */
+ switch (i_key & KEY_SPECIAL)
+ {
+ case KEY_MOUSEWHEELUP:
+ i_action = ACTIONID_VOL_UP;
+ break;
+ case KEY_MOUSEWHEELDOWN:
+ i_action = ACTIONID_VOL_DOWN;
+ break;
+ case KEY_MOUSEWHEELLEFT:
+ i_action = ACTIONID_JUMP_BACKWARD_EXTRASHORT;
+ break;
+ case KEY_MOUSEWHEELRIGHT:
+ i_action = ACTIONID_JUMP_FORWARD_EXTRASHORT;
+ break;
+ default: break;
+ }
+
+ /* No mouse action, find action triggered by hotkey */
+ if(!i_action)
+ {
+ for( i = 0; i_key != -1 && p_hotkeys[i].psz_action != NULL; i++ )
+ {
+ if( p_hotkeys[i].i_key == i_key )
+ {
+ i_action = p_hotkeys[i].i_action;
+ i_times = p_hotkeys[i].i_times;
+ /* times key pressed within max. delta time */
+ p_hotkeys[i].i_times = 0;
+ break;
+ }
+ }
+ }
+
+ if( !i_action )
{
- vlc_object_release( p_intf->p_sys->p_input );
- p_intf->p_sys->p_input = NULL;
+ vlc_mutex_lock( &p_intf->object_lock );
+ vlc_cond_wait( &p_intf->object_wait, &p_intf->object_lock );
+ vlc_mutex_unlock( &p_intf->object_lock );
+ /* No key pressed, sleep a bit more */
+// msleep( INTF_IDLE_SLEEP );
+ continue;
}
- p_input = p_intf->p_sys->p_input;
+ /* Update the input */
+ PL_LOCK;
+ p_input = p_playlist->p_input;
+ if( p_input )
+ vlc_object_yield( p_input );
+ PL_UNLOCK;
+
/* Update the vout */
- p_last_vout = p_intf->p_sys->p_vout;
- if( p_vout == NULL )
- {
- p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
- p_intf->p_sys->p_vout = p_vout;
- }
- else if( p_vout->b_die )
- {
- vlc_object_release( p_vout );
- p_vout = NULL;
- p_intf->p_sys->p_vout = NULL;
- }
+ p_last_vout = p_vout;
+ p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
/* Register OSD channels */
if( p_vout && p_vout != p_last_vout )
}
}
- /* Find action triggered by hotkey */
- i_action = 0;
- i_key = GetKey( p_intf );
- for( i = 0; i_key != -1 && p_hotkeys[i].psz_action != NULL; i++ )
- {
- if( p_hotkeys[i].i_key == i_key )
- {
- i_action = p_hotkeys[i].i_action;
- i_times = p_hotkeys[i].i_times;
- /* times key pressed within max. delta time */
- p_hotkeys[i].i_times = 0;
- }
- }
-
- if( !i_action )
- {
- /* No key pressed, sleep a bit more */
- msleep( INTF_IDLE_SLEEP );
- continue;
- }
-
if( i_action == ACTIONID_QUIT )
{
p_intf->p_libvlc->b_die = VLC_TRUE;
ClearChannels( p_intf, p_vout );
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Quit" ) );
+ if( p_vout )
+ vlc_object_release( p_vout );
+ if( p_input )
+ vlc_object_release( p_input );
continue;
}
else if( i_action == ACTIONID_VOL_UP )
}
}
else if( i_action == ACTIONID_INTF_SHOW )
- {
- val.b_bool = VLC_TRUE;
- p_playlist = pl_Yield( p_intf );
- var_Set( p_playlist, "intf-show", val );
- vlc_object_release( p_playlist );
- }
+ var_SetBool( p_playlist, "intf-show", VLC_TRUE );
else if( i_action == ACTIONID_INTF_HIDE )
- {
- val.b_bool = VLC_FALSE;
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
- {
- var_Set( p_playlist, "intf-show", val );
- vlc_object_release( p_playlist );
- }
- }
+ var_SetBool( p_playlist, "intf-show", VLC_FALSE );
else if( i_action == ACTIONID_SNAPSHOT )
{
if( p_vout ) vout_Control( p_vout, VOUT_SNAPSHOT );
}
else
{
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
- {
- var_Get( p_playlist, "fullscreen", &val );
- val.b_bool = !val.b_bool;
- var_Set( p_playlist, "fullscreen", val );
- vlc_object_release( p_playlist );
- }
+ var_Get( p_playlist, "fullscreen", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "fullscreen", val );
+ }
+ }
+ else if( i_action == ACTIONID_LOOP )
+ {
+ /* Toggle Normal -> Loop -> Repeat -> Normal ... */
+ vlc_value_t val2;
+ var_Get( p_playlist, "loop", &val );
+ var_Get( p_playlist, "repeat", &val2 );
+ if( val2.b_bool == VLC_TRUE )
+ {
+ val.b_bool = VLC_FALSE;
+ val2.b_bool = VLC_FALSE;
}
+ else if( val.b_bool == VLC_TRUE )
+ {
+ val.b_bool = VLC_FALSE;
+ val2.b_bool = VLC_TRUE;
+ }
+ else
+ {
+ val.b_bool = VLC_TRUE;
+ }
+ var_Set( p_playlist, "loop", val );
+ var_Set( p_playlist, "repeat", val2 );
+ }
+ else if( i_action == ACTIONID_RANDOM )
+ {
+ var_Get( p_playlist, "random", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "random", val );
}
else if( i_action == ACTIONID_PLAY_PAUSE )
{
}
else
{
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
- {
- playlist_Play( p_playlist );
- vlc_object_release( p_playlist );
- }
+ playlist_Play( p_playlist );
}
}
else if( p_input )
}
}
else if( i_action == ACTIONID_CROP_TOP && p_vout )
- {
- int i_val = var_GetInteger( p_vout, "crop-top" );
- var_SetInteger( p_vout, "crop-top", i_val+1 );
- }
+ var_IncInteger( p_vout, "crop-top" );
else if( i_action == ACTIONID_UNCROP_TOP && p_vout )
- {
- int i_val = var_GetInteger( p_vout, "crop-top" );
- if( i_val != 0 )
- var_SetInteger( p_vout, "crop-top", i_val-1 );
- }
+ var_DecInteger( p_vout, "crop-top" );
else if( i_action == ACTIONID_CROP_BOTTOM && p_vout )
- {
- int i_val = var_GetInteger( p_vout, "crop-bottom" );
- var_SetInteger( p_vout, "crop-bottom", i_val+1 );
- }
+ var_IncInteger( p_vout, "crop-bottom" );
else if( i_action == ACTIONID_UNCROP_BOTTOM && p_vout )
- {
- int i_val = var_GetInteger( p_vout, "crop-bottom" );
- if( i_val != 0 )
- var_SetInteger( p_vout, "crop-bottom", i_val-1 );
- }
+ var_DecInteger( p_vout, "crop-bottom" );
else if( i_action == ACTIONID_CROP_LEFT && p_vout )
- {
- int i_val = var_GetInteger( p_vout, "crop-left" );
- var_SetInteger( p_vout, "crop-left", i_val+1 );
- }
+ var_IncInteger( p_vout, "crop-left" );
else if( i_action == ACTIONID_UNCROP_LEFT && p_vout )
- {
- int i_val = var_GetInteger( p_vout, "crop-left" );
- if( i_val != 0 )
- var_SetInteger( p_vout, "crop-left", i_val-1 );
- }
+ var_DecInteger( p_vout, "crop-left" );
else if( i_action == ACTIONID_CROP_RIGHT && p_vout )
- {
- int i_val = var_GetInteger( p_vout, "crop-right" );
- var_SetInteger( p_vout, "crop-right", i_val+1 );
- }
+ var_IncInteger( p_vout, "crop-right" );
else if( i_action == ACTIONID_UNCROP_RIGHT && p_vout )
- {
- int i_val = var_GetInteger( p_vout, "crop-right" );
- if( i_val != 0 )
- var_SetInteger( p_vout, "crop-right", i_val-1 );
- }
+ var_DecInteger( p_vout, "crop-right" );
+
else if( i_action == ACTIONID_NEXT )
{
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
- {
- vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
- _("Next") );
- playlist_Next( p_playlist );
- vlc_object_release( p_playlist );
- }
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, _("Next") );
+ playlist_Next( p_playlist );
}
else if( i_action == ACTIONID_PREV )
{
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
- {
- vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
- _("Previous") );
- playlist_Prev( p_playlist );
- vlc_object_release( p_playlist );
- }
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ _("Previous") );
+ playlist_Prev( p_playlist );
}
else if( i_action == ACTIONID_STOP )
{
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
- {
- playlist_Stop( p_playlist );
- vlc_object_release( p_playlist );
- }
+ playlist_Stop( p_playlist );
}
else if( i_action == ACTIONID_FASTER )
{
- vlc_value_t val;
- val.b_bool = VLC_TRUE;
- var_Set( p_input, "rate-faster", val );
+ var_SetVoid( p_input, "rate-faster" );
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Faster") );
}
else if( i_action == ACTIONID_SLOWER )
{
- vlc_value_t val;
- val.b_bool = VLC_TRUE;
- var_Set( p_input, "rate-slower", val );
+ var_SetVoid( p_input, "rate-slower" );
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Slower") );
}
}
/* Only makes sense with DVD */
else if( i_action == ACTIONID_TITLE_PREV )
- {
- val.b_bool = VLC_TRUE;
- var_Set( p_input, "prev-title", val );
- }
+ var_SetVoid( p_input, "prev-title" );
else if( i_action == ACTIONID_TITLE_NEXT )
- {
- val.b_bool = VLC_TRUE;
- var_Set( p_input, "next-title", val );
- }
+ var_SetVoid( p_input, "next-title" );
else if( i_action == ACTIONID_CHAPTER_PREV )
- {
- val.b_bool = VLC_TRUE;
- var_Set( p_input, "prev-chapter", val );
- }
+ var_SetVoid( p_input, "prev-chapter" );
else if( i_action == ACTIONID_CHAPTER_NEXT )
- {
- val.b_bool = VLC_TRUE;
- var_Set( p_input, "next-chapter", val );
- }
+ var_SetVoid( p_input, "next-chapter" );
else if( i_action == ACTIONID_DISC_MENU )
- {
- vlc_value_t val; val.i_int = 2;
- var_Set( p_input, "title 0", val);
- }
+ var_SetInteger( p_input, "title 0", 2 );
+
else if( i_action == ACTIONID_SUBDELAY_DOWN )
{
int64_t i_delay = var_GetTime( p_input, "spu-delay" );
-
i_delay -= 50000; /* 50 ms */
-
var_SetTime( p_input, "spu-delay", i_delay );
ClearChannels( p_intf, p_vout );
- vout_OSDMessage( p_intf, DEFAULT_CHAN, "Subtitle delay %i ms",
+ vout_OSDMessage( p_intf, DEFAULT_CHAN,
+ _( "Subtitle delay %i ms" ),
(int)(i_delay/1000) );
}
else if( i_action == ACTIONID_SUBDELAY_UP )
{
int64_t i_delay = var_GetTime( p_input, "spu-delay" );
-
i_delay += 50000; /* 50 ms */
-
var_SetTime( p_input, "spu-delay", i_delay );
ClearChannels( p_intf, p_vout );
- vout_OSDMessage( p_intf, DEFAULT_CHAN, "Subtitle delay %i ms",
+ vout_OSDMessage( p_intf, DEFAULT_CHAN,
+ _( "Subtitle delay %i ms" ),
(int)(i_delay/1000) );
}
else if( i_action == ACTIONID_AUDIODELAY_DOWN )
{
int64_t i_delay = var_GetTime( p_input, "audio-delay" );
-
i_delay -= 50000; /* 50 ms */
-
var_SetTime( p_input, "audio-delay", i_delay );
ClearChannels( p_intf, p_vout );
- vout_OSDMessage( p_intf, DEFAULT_CHAN, "Audio delay %i ms",
+ vout_OSDMessage( p_intf, DEFAULT_CHAN,
+ _( "Audio delay %i ms" ),
(int)(i_delay/1000) );
}
else if( i_action == ACTIONID_AUDIODELAY_UP )
{
int64_t i_delay = var_GetTime( p_input, "audio-delay" );
-
i_delay += 50000; /* 50 ms */
-
var_SetTime( p_input, "audio-delay", i_delay );
ClearChannels( p_intf, p_vout );
- vout_OSDMessage( p_intf, DEFAULT_CHAN, "Audio delay %i ms",
+ vout_OSDMessage( p_intf, DEFAULT_CHAN,
+ _( "Audio delay %i ms" ),
(int)(i_delay/1000) );
}
else if( i_action == ACTIONID_PLAY )
{
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
+ var_Get( p_input, "rate", &val );
+ if( val.i_int != INPUT_RATE_DEFAULT )
{
- var_Get( p_input, "rate", &val );
- msg_Dbg( p_input, "rate %d", val.i_int );
- if( val.i_int != INPUT_RATE_DEFAULT )
- {
- /* Return to normal speed */
- val.i_int = INPUT_RATE_DEFAULT;
- var_Set( p_input, "rate", val );
- }
- else
- {
- ClearChannels( p_intf, p_vout );
- vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
- OSD_PLAY_ICON );
- playlist_Play( p_playlist );
- }
- vlc_object_release( p_playlist );
+ /* Return to normal speed */
+ var_SetInteger( p_input, "rate", INPUT_RATE_DEFAULT );
+ }
+ else
+ {
+ ClearChannels( p_intf, p_vout );
+ vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
+ OSD_PLAY_ICON );
+ playlist_Play( p_playlist );
}
}
}
+ if( p_vout )
+ vlc_object_release( p_vout );
+ if( p_input )
+ vlc_object_release( p_input );
}
+ pl_Release( p_intf );
}
static int GetKey( intf_thread_t *p_intf)
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
intf_thread_t *p_intf = (intf_thread_t *)p_data;
+ if ( !newval.i_int )
+ {
+ msg_Warn( p_this, "Received invalid key event %d", newval.i_int );
+ return VLC_EGENERIC;
+ }
vlc_mutex_lock( &p_intf->p_sys->change_lock );
if ( p_intf->p_sys->i_size == BUFFER_SIZE )
{
p_intf->p_sys->p_keys[ p_intf->p_sys->i_size ] = newval.i_int;
p_intf->p_sys->i_size++;
}
+ vlc_mutex_lock( &p_intf->object_lock );
+ vlc_cond_signal( &p_intf->object_wait );
+ vlc_mutex_unlock( &p_intf->object_lock );
vlc_mutex_unlock( &p_intf->p_sys->change_lock );
return VLC_SUCCESS;
static void PlayBookmark( intf_thread_t *p_intf, int i_num )
{
vlc_value_t val;
- int i;
char psz_bookmark_name[11];
- playlist_t *p_playlist =
- vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ playlist_t *p_playlist = pl_Yield( p_intf );
sprintf( psz_bookmark_name, "bookmark%i", i_num );
var_Create( p_intf, psz_bookmark_name, VLC_VAR_STRING|VLC_VAR_DOINHERIT );
var_Get( p_intf, psz_bookmark_name, &val );
- if( p_playlist )
- {
- char *psz_bookmark = strdup( val.psz_string );
- for( i = 0; i < p_playlist->i_size; i++)
+ char *psz_bookmark = strdup( val.psz_string );
+ PL_LOCK;
+ FOREACH_ARRAY( playlist_item_t *p_item, p_playlist->items )
+ if( !strcmp( psz_bookmark, p_item->p_input->psz_uri ) )
{
- if( !strcmp( psz_bookmark,
- p_playlist->pp_items[i]->p_input->psz_uri ) )
- {
- playlist_LockControl( p_playlist, PLAYLIST_VIEWPLAY, NULL,
- p_playlist->pp_items[i] );
- break;
- }
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE,
+ NULL, p_item );
+ break;
}
- vlc_object_release( p_playlist );
- }
+ FOREACH_END();
+ PL_UNLOCK;
+ vlc_object_release( p_playlist );
}
static void SetBookmark( intf_thread_t *p_intf, int i_num )
{
- 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 );
+ char psz_bookmark_name[11];
+ sprintf( psz_bookmark_name, "bookmark%i", i_num );
+ var_Create( p_intf, psz_bookmark_name,
+ VLC_VAR_STRING|VLC_VAR_DOINHERIT );
+ if( p_playlist->status.p_item )
{
- char psz_bookmark_name[11];
- sprintf( psz_bookmark_name, "bookmark%i", i_num );
- var_Create( p_intf, psz_bookmark_name,
- VLC_VAR_STRING|VLC_VAR_DOINHERIT );
- if( p_playlist->status.p_item )
- {
- config_PutPsz( p_intf, psz_bookmark_name,
- p_playlist->status.p_item->p_input->psz_uri);
- msg_Info( p_intf, "setting playlist bookmark %i to %s", i_num,
- p_playlist->status.p_item->p_input->psz_uri);
- config_SaveConfigFile( p_intf, "hotkeys" );
- }
- vlc_object_release( p_playlist );
+ config_PutPsz( p_intf, psz_bookmark_name,
+ p_playlist->status.p_item->p_input->psz_uri);
+ msg_Info( p_intf, "setting playlist bookmark %i to %s", i_num,
+ p_playlist->status.p_item->p_input->psz_uri);
+ config_SaveConfigFile( p_intf, "hotkeys" );
}
+ pl_Release( p_intf );
}
static void DisplayPosition( intf_thread_t *p_intf, vout_thread_t *p_vout,
vlc_value_t time, pos;
mtime_t i_seconds;
- if( p_vout == NULL )
- {
- return;
- }
+ if( p_vout == NULL ) return;
+
ClearChannels( p_intf, p_vout );
var_Get( p_input, "time", &time );
if( time.i_time > 0 )
{
secstotimestr( psz_duration, time.i_time / 1000000 );
- vout_OSDMessage( p_input, POSITION_TEXT_CHAN, "%s / %s",
+ vout_OSDMessage( p_input, POSITION_TEXT_CHAN, (char *) "%s / %s",
psz_time, psz_duration );
}
else if( i_seconds > 0 )
}
else
{
- vout_OSDMessage( p_vout, VOLUME_TEXT_CHAN, "Volume %d%%",
+ vout_OSDMessage( p_vout, VOLUME_TEXT_CHAN, _( "Volume %d%%" ),
i_vol*400/AOUT_VOLUME_MAX );
}
}
projects / vlc / blobdiff