#include <vlc_aout.h>
#include <vlc_osd.h>
#include <vlc_playlist.h>
-#include "vlc_keys.h"
+#include <vlc_keys.h>
#include "math.h"
-#define BUFFER_SIZE 10
-
#define CHANNELS_NUMBER 4
#define VOLUME_TEXT_CHAN p_intf->p_sys->p_channels[ 0 ]
#define VOLUME_WIDGET_CHAN p_intf->p_sys->p_channels[ 1 ]
*****************************************************************************/
struct intf_sys_t
{
- int p_actions[ BUFFER_SIZE ]; /* buffer that contains
- * action events */
- int i_size; /* number of events in buffer */
+ vout_thread_t *p_last_vout;
int p_channels[ CHANNELS_NUMBER ]; /* contains registered
* channel IDs */
- input_thread_t * p_input; /* pointer to input */
- vout_thread_t * p_vout; /* pointer to vout object */
- vlc_mutex_t lock; /* callback lock */
- vlc_cond_t wait; /* callback event */
int i_mousewheel_mode;
};
*****************************************************************************/
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
-static void Run ( intf_thread_t * );
-static int GetAction( intf_thread_t *);
static int ActionEvent( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static int SpecialKeyEvent( vlc_object_t *, char const *,
set_description( N_("Hotkeys management interface") )
set_capability( "interface", 0 )
set_callbacks( Open, Close )
+ set_category( CAT_INTERFACE )
+ set_subcategory( SUBCAT_INTERFACE_HOTKEYS )
add_integer( "hotkeys-mousewheel-mode", MOUSEWHEEL_VOLUME, NULL,
N_("MouseWheel x-axis Control"),
return VLC_ENOMEM;
p_intf->p_sys = p_sys;
- p_intf->pf_run = Run;
+ p_intf->pf_run = NULL;
- p_sys->i_size = 0;
- vlc_mutex_init( &p_sys->lock );
- vlc_cond_init( &p_sys->wait );
+ p_sys->p_last_vout = NULL;
p_intf->p_sys->i_mousewheel_mode =
config_GetInt( p_intf, "hotkeys-mousewheel-mode" );
var_DelCallback( p_intf->p_libvlc, "key-action", ActionEvent, p_intf );
var_DelCallback( p_intf->p_libvlc, "key-pressed", SpecialKeyEvent, p_intf );
- vlc_cond_destroy( &p_sys->wait );
- vlc_mutex_destroy( &p_sys->lock );
-
/* Destroy structure */
- free( p_intf->p_sys );
+ free( p_sys );
}
-/*****************************************************************************
- * Run: main loop
- *****************************************************************************/
-static void Run( intf_thread_t *p_intf )
+static int PutAction( intf_thread_t *p_intf, int i_action )
{
- vout_thread_t *p_vout = NULL;
- aout_instance_t *p_aout = NULL;
+ intf_sys_t *p_sys = p_intf->p_sys;
playlist_t *p_playlist = pl_Hold( p_intf );
- int canc = vlc_savecancel();
-
- vlc_cleanup_push( __pl_Release, p_intf );
-
- for( ;; )
- {
- input_thread_t *p_input;
- vout_thread_t *p_last_vout;
- int i_action;
-
- vlc_restorecancel( canc );
- i_action = GetAction( p_intf );
-
- canc = vlc_savecancel();
- /* Update the input */
- p_input = playlist_CurrentInput( p_playlist );
+ /* Update the input */
+ input_thread_t *p_input = playlist_CurrentInput( p_playlist );
- /* Update the vout */
- p_last_vout = p_vout;
- p_vout = p_input ? input_GetVout( p_input ) : NULL;
+ /* Update the vout */
+ vout_thread_t *p_vout = p_input ? input_GetVout( p_input ) : NULL;
- /* Update the aout */
- p_aout = p_input ? input_GetAout( p_input ) : NULL;
+ /* Update the aout */
+ aout_instance_t *p_aout = p_input ? input_GetAout( p_input ) : NULL;
- /* Register OSD channels */
- if( p_vout && p_vout != p_last_vout )
- {
- int i;
- for( i = 0; i < CHANNELS_NUMBER; i++ )
- {
- spu_Control( p_vout->p_spu, SPU_CHANNEL_REGISTER,
- &p_intf->p_sys->p_channels[ i ] );
- }
- }
+ /* Register OSD channels */
+ /* FIXME: this check can fail if the new vout is reallocated at the same
+ * address as the old one... We should rather listen to vout events.
+ * Alternatively, we should keep a reference to the vout thread. */
+ if( p_vout && p_vout != p_sys->p_last_vout )
+ for( unsigned i = 0; i < CHANNELS_NUMBER; i++ )
+ spu_Control( vout_GetSpu( p_vout ), SPU_CHANNEL_REGISTER,
+ &p_intf->p_sys->p_channels[ i ] );
+ p_sys->p_last_vout = p_vout;
- /* Quit */
- if( i_action == ACTIONID_QUIT )
- {
+ /* Quit */
+ switch( i_action )
+ {
+ case ACTIONID_QUIT:
libvlc_Quit( p_intf->p_libvlc );
ClearChannels( p_intf, p_vout );
- vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Quit" ) );
- goto cleanup_and_continue;
- }
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Quit" ) );
+ break;
+
/* Volume and audio actions */
- else if( i_action == ACTIONID_VOL_UP )
+ case ACTIONID_VOL_UP:
{
audio_volume_t i_newvol;
- aout_VolumeUp( p_intf, 1, &i_newvol );
+ aout_VolumeUp( p_playlist, 1, &i_newvol );
DisplayVolume( p_intf, p_vout, i_newvol );
+ break;
}
- else if( i_action == ACTIONID_VOL_DOWN )
+
+ case ACTIONID_VOL_DOWN:
{
audio_volume_t i_newvol;
- aout_VolumeDown( p_intf, 1, &i_newvol );
+ aout_VolumeDown( p_playlist, 1, &i_newvol );
DisplayVolume( p_intf, p_vout, i_newvol );
+ break;
}
- else if( i_action == ACTIONID_VOL_MUTE )
+
+ case ACTIONID_VOL_MUTE:
{
audio_volume_t i_newvol = -1;
- aout_VolumeMute( p_intf, &i_newvol );
+ aout_ToggleMute( p_playlist, &i_newvol );
if( p_vout )
{
if( i_newvol == 0 )
OSD_MUTE_ICON );
}
else
- {
DisplayVolume( p_intf, p_vout, i_newvol );
- }
}
+ break;
}
+
/* Interface showing */
- else if( i_action == ACTIONID_INTF_SHOW )
+ case ACTIONID_INTF_SHOW:
var_SetBool( p_intf->p_libvlc, "intf-show", true );
- else if( i_action == ACTIONID_INTF_HIDE )
+ break;
+
+ case ACTIONID_INTF_HIDE:
var_SetBool( p_intf->p_libvlc, "intf-show", false );
+ break;
+
/* Video Output actions */
- else if( i_action == ACTIONID_SNAPSHOT )
- {
- if( p_vout ) var_TriggerCallback( p_vout, "video-snapshot" );
- }
- else if( i_action == ACTIONID_TOGGLE_FULLSCREEN )
+ case ACTIONID_SNAPSHOT:
+ if( p_vout )
+ var_TriggerCallback( p_vout, "video-snapshot" );
+ break;
+
+ case ACTIONID_TOGGLE_FULLSCREEN:
{
vlc_object_t *obj = p_vout ? VLC_OBJECT(p_vout)
: VLC_OBJECT(p_playlist);
- bool b = var_GetBool( obj, "fullscreen" );
- var_SetBool( obj, "fullscreen", !b );
+ var_ToggleBool( obj, "fullscreen" );
+ break;
}
- else if( i_action == ACTIONID_LEAVE_FULLSCREEN )
- {
+
+ case ACTIONID_LEAVE_FULLSCREEN:
if( p_vout && var_GetBool( p_vout, "fullscreen" ) )
- {
var_SetBool( p_vout, "fullscreen", false );
- }
- }
- else if( i_action == ACTIONID_ZOOM_QUARTER ||
- i_action == ACTIONID_ZOOM_HALF ||
- i_action == ACTIONID_ZOOM_ORIGINAL ||
- i_action == ACTIONID_ZOOM_DOUBLE )
- {
+ break;
+
+ case ACTIONID_ZOOM_QUARTER:
+ case ACTIONID_ZOOM_HALF:
+ case ACTIONID_ZOOM_ORIGINAL:
+ case ACTIONID_ZOOM_DOUBLE:
if( p_vout )
{
float f;
}
var_SetFloat( p_vout, "zoom", f );
}
- }
+ break;
+
#ifdef WIN32
- else if( i_action == ACTIONID_WALLPAPER )
+ case ACTIONID_WALLPAPER:
{ /* FIXME: this is invalid if not using DirectX output!!! */
vlc_object_t *obj = p_vout ? VLC_OBJECT(p_vout)
: VLC_OBJECT(p_playlist);
- bool b = var_GetBool( obj, "directx-wallpaper" );
- var_SetBool( obj, "directx-wallpaper", !b );
+ var_ToggleBool( obj, "directx-wallpaper" );
}
#endif
+
/* Playlist actions */
- else if( i_action == ACTIONID_LOOP )
- {
+ case ACTIONID_LOOP:
/* Toggle Normal -> Loop -> Repeat -> Normal ... */
if( var_GetBool( p_playlist, "repeat" ) )
var_SetBool( p_playlist, "repeat", false );
}
else
var_SetBool( p_playlist, "loop", true );
- }
- else if( i_action == ACTIONID_RANDOM )
+ break;
+
+ case ACTIONID_RANDOM:
{
- bool b = var_GetBool( p_playlist, "random" );
- var_SetBool( p_playlist, "random", !b );
+ var_ToggleBool( p_playlist, "random" );
}
- else if( i_action == ACTIONID_PLAY_PAUSE )
- {
+
+ case ACTIONID_PLAY_PAUSE:
if( p_input )
{
ClearChannels( p_intf, p_vout );
var_SetInteger( p_input, "state", state );
}
else
- {
playlist_Play( p_playlist );
- }
- }
- else if( ( i_action == ACTIONID_AUDIODEVICE_CYCLE ) && p_aout )
+ break;
+
+ case ACTIONID_AUDIODEVICE_CYCLE:
{
+ if( !p_aout )
+ break;
+
vlc_value_t val, list, list2;
int i_count, i;
list2.p_list->p_values[i].psz_string);
}
var_FreeList( &list, &list2 );
+ break;
}
+
/* Input options */
- else if( p_input )
+ default:
{
+ if( !p_input )
+ break;
+
bool b_seekable = var_GetBool( p_input, "can-seek" );
int i_interval =0;
{
var_SetFloat( p_vout, "scale", 1.0 );
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
- _("Zooming reset") );
+ "%s", _("Zooming reset") );
}
else
{
var_SetBool( p_vout, "autoscale", b_autoscale );
if( b_autoscale )
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
- _("Scaled to screen") );
+ "%s", _("Scaled to screen") );
else
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
- _("Original Size") );
+ "%s", _("Original Size") );
}
}
else if( i_action == ACTIONID_SCALE_UP && p_vout )
else if( i_action == ACTIONID_DEINTERLACE && p_vout )
{
vlc_value_t val={0}, val_list, text_list;
- var_Get( p_vout, "deinterlace", &val );
- if( var_Change( p_vout, "deinterlace", VLC_VAR_GETLIST,
+ var_Get( p_vout, "deinterlace-mode", &val );
+ if( var_Change( p_vout, "deinterlace-mode", VLC_VAR_GETLIST,
&val_list, &text_list ) >= 0 )
{
int i;
}
}
if( i == val_list.p_list->i_count ) i = 0;
- var_SetString( p_vout, "deinterlace",
+ var_SetString( p_vout, "deinterlace-mode",
val_list.p_list->p_values[i].psz_string );
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Deinterlace mode: %s"),
}
free( val.psz_string );
}
- else if( ( i_action == ACTIONID_ZOOM || i_action == ACTIONID_UNZOOM ) && p_vout )
+ else if( ( i_action == ACTIONID_ZOOM ||
+ i_action == ACTIONID_UNZOOM ) && p_vout )
{
vlc_value_t val={0}, val_list, text_list;
var_Get( p_vout, "zoom", &val );
else if( i_action == ACTIONID_NEXT )
{
- vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, _("Next") );
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, "%s", _("Next") );
playlist_Next( p_playlist );
}
else if( i_action == ACTIONID_PREV )
{
- vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, "%s",
_("Previous") );
playlist_Prev( p_playlist );
}
}
else if( i_action == ACTIONID_FRAME_NEXT )
{
- var_SetVoid( p_input, "frame-next" );
+ var_TriggerCallback( p_input, "frame-next" );
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
- _("Next frame") );
+ "%s", _("Next frame") );
}
else if( i_action == ACTIONID_FASTER )
{
- var_SetVoid( p_input, "rate-faster" );
+ var_TriggerCallback( p_input, "rate-faster" );
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
- _("Faster") );
+ "%s", _("Faster") );
}
else if( i_action == ACTIONID_SLOWER )
{
- var_SetVoid( p_input, "rate-slower" );
+ var_TriggerCallback( p_input, "rate-slower" );
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
- _("Slower") );
+ "%s", _("Slower") );
}
else if( i_action == ACTIONID_RATE_NORMAL )
{
var_SetInteger( p_input, "rate", INPUT_RATE_DEFAULT );
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
- _("1.00x") );
+ "%s", _("1.00x") );
}
else if( i_action == ACTIONID_RATE_FASTER_FINE ||
i_action == ACTIONID_RATE_SLOWER_FINE )
char psz_msg[7+1];
snprintf( psz_msg, sizeof(psz_msg), _("%.2fx"), (double)INPUT_RATE_DEFAULT / i_rate );
- vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, psz_msg );
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, "%s", psz_msg );
}
else if( i_action == ACTIONID_POSITION && b_seekable )
{
}
/* Only makes sense with DVD */
else if( i_action == ACTIONID_TITLE_PREV )
- var_SetVoid( p_input, "prev-title" );
+ var_TriggerCallback( p_input, "prev-title" );
else if( i_action == ACTIONID_TITLE_NEXT )
- var_SetVoid( p_input, "next-title" );
+ var_TriggerCallback( p_input, "next-title" );
else if( i_action == ACTIONID_CHAPTER_PREV )
- var_SetVoid( p_input, "prev-chapter" );
+ var_TriggerCallback( p_input, "prev-chapter" );
else if( i_action == ACTIONID_CHAPTER_NEXT )
- var_SetVoid( p_input, "next-chapter" );
+ var_TriggerCallback( p_input, "next-chapter" );
else if( i_action == ACTIONID_DISC_MENU )
var_SetInteger( p_input, "title 0", 2 );
const bool b_record = !var_GetBool( p_input, "record" );
if( b_record )
- vout_OSDMessage( p_intf, DEFAULT_CHAN, _("Recording") );
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _("Recording") );
else
- vout_OSDMessage( p_intf, DEFAULT_CHAN, _("Recording done") );
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _("Recording done") );
var_SetBool( p_input, "record", b_record );
}
}
}
-cleanup_and_continue:
- if( p_aout )
- vlc_object_release( p_aout );
- if( p_vout )
- vlc_object_release( p_vout );
- if( p_input )
- vlc_object_release( p_input );
}
-
- /* dead code */
- abort();
- vlc_cleanup_pop();
-}
-
-static int GetAction( intf_thread_t *p_intf )
-{
- intf_sys_t *p_sys = p_intf->p_sys;
- int i_ret;
-
- vlc_mutex_lock( &p_sys->lock );
- mutex_cleanup_push( &p_sys->lock );
-
- while( p_sys->i_size == 0 )
- vlc_cond_wait( &p_sys->wait, &p_sys->lock );
-
- i_ret = p_sys->p_actions[ 0 ];
- p_sys->i_size--;
- for( int i = 0; i < p_sys->i_size; i++ )
- p_sys->p_actions[i] = p_sys->p_actions[i + 1];
-
- vlc_cleanup_run();
- return i_ret;
-}
-
-static int PutAction( intf_thread_t *p_intf, int i_action )
-{
- intf_sys_t *p_sys = p_intf->p_sys;
- int i_ret = VLC_EGENERIC;
-
- vlc_mutex_lock( &p_sys->lock );
- if ( p_sys->i_size >= BUFFER_SIZE )
- msg_Warn( p_intf, "event buffer full, dropping key actions" );
- else
- p_sys->p_actions[p_sys->i_size++] = i_action;
-
- vlc_cond_signal( &p_sys->wait );
- vlc_mutex_unlock( &p_sys->lock );
- return i_ret;
+cleanup_and_continue:
+ if( p_aout )
+ vlc_object_release( p_aout );
+ if( p_vout )
+ vlc_object_release( p_vout );
+ if( p_input )
+ vlc_object_release( p_input );
+ pl_Release( p_intf );
+ return VLC_SUCCESS;
}
/*****************************************************************************
vout_OSDMessage( p_input, POSITION_TEXT_CHAN, "%s", psz_time );
}
- if( p_vout->b_fullscreen )
+ if( var_GetBool( p_vout, "fullscreen" ) )
{
var_Get( p_input, "position", &pos );
vout_OSDSlider( VLC_OBJECT( p_input ), POSITION_WIDGET_CHAN,
}
ClearChannels( p_intf, p_vout );
- if( p_vout->b_fullscreen )
+ if( var_GetBool( p_vout, "fullscreen" ) )
{
vout_OSDSlider( VLC_OBJECT( p_vout ), VOLUME_WIDGET_CHAN,
i_vol*100/AOUT_VOLUME_MAX, OSD_VERT_SLIDER );
if( p_vout )
{
- spu_Control( p_vout->p_spu, SPU_CHANNEL_CLEAR, DEFAULT_CHAN );
+ spu_t *p_spu = vout_GetSpu( p_vout );
+ spu_Control( p_spu, SPU_CHANNEL_CLEAR, DEFAULT_CHAN );
for( i = 0; i < CHANNELS_NUMBER; i++ )
{
- spu_Control( p_vout->p_spu, SPU_CHANNEL_CLEAR,
+ spu_Control( p_spu, SPU_CHANNEL_CLEAR,
p_intf->p_sys->p_channels[ i ] );
}
}
projects / vlc / blobdiff