/*****************************************************************************
* hotkeys.c: Hotkey handling for vlc
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2005 the VideoLAN team
* $Id$
*
- * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
+ * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
+ * Jean-Paul Saman <jpsaman #_at_# m2x.nl>
*
* 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.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#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 <osd.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <vlc_common.h>
+#include <vlc_plugin.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
*****************************************************************************/
struct intf_sys_t
{
- vlc_mutex_t change_lock; /* mutex to keep the callback
- * and the main loop from
- * stepping on each others
- * toes */
- int p_keys[ BUFFER_SIZE ]; /* buffer that contains
- * keyevents */
+ int p_actions[ BUFFER_SIZE ]; /* buffer that contains
+ * action events */
int i_size; /* number of events in buffer */
int p_channels[ CHANNELS_NUMBER ]; /* contains registered
* channel IDs */
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
static void Run ( intf_thread_t * );
-static int GetKey ( intf_thread_t *);
-static int KeyEvent( vlc_object_t *, char const *,
- vlc_value_t, vlc_value_t, void * );
-static int ActionKeyCB( vlc_object_t *, char const *,
+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 *,
+ vlc_value_t, vlc_value_t, void * );
static void PlayBookmark( intf_thread_t *, int );
static void SetBookmark ( intf_thread_t *, int );
static void DisplayPosition( intf_thread_t *, vout_thread_t *, input_thread_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define BOOKMARK1_TEXT N_("Playlist bookmark 1")
-#define BOOKMARK2_TEXT N_("Playlist bookmark 2")
-#define BOOKMARK3_TEXT N_("Playlist bookmark 3")
-#define BOOKMARK4_TEXT N_("Playlist bookmark 4")
-#define BOOKMARK5_TEXT N_("Playlist bookmark 5")
-#define BOOKMARK6_TEXT N_("Playlist bookmark 6")
-#define BOOKMARK7_TEXT N_("Playlist bookmark 7")
-#define BOOKMARK8_TEXT N_("Playlist bookmark 8")
-#define BOOKMARK9_TEXT N_("Playlist bookmark 9")
-#define BOOKMARK10_TEXT N_("Playlist bookmark 10")
-#define BOOKMARK_LONGTEXT N_( \
- "This option allows you to define playlist bookmarks.")
+#define BOOKMARK1_TEXT N_("Playlist bookmark 1")
+#define BOOKMARK2_TEXT N_("Playlist bookmark 2")
+#define BOOKMARK3_TEXT N_("Playlist bookmark 3")
+#define BOOKMARK4_TEXT N_("Playlist bookmark 4")
+#define BOOKMARK5_TEXT N_("Playlist bookmark 5")
+#define BOOKMARK6_TEXT N_("Playlist bookmark 6")
+#define BOOKMARK7_TEXT N_("Playlist bookmark 7")
+#define BOOKMARK8_TEXT N_("Playlist bookmark 8")
+#define BOOKMARK9_TEXT N_("Playlist bookmark 9")
+#define BOOKMARK10_TEXT N_("Playlist bookmark 10")
+#define BOOKMARK_LONGTEXT N_("Define playlist bookmarks.")
vlc_module_begin();
- set_description( _("Hotkeys management interface") );
- add_string( "bookmark1", NULL, NULL,
- BOOKMARK1_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
- add_string( "bookmark2", NULL, NULL,
- BOOKMARK2_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
- add_string( "bookmark3", NULL, NULL,
- BOOKMARK3_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
- add_string( "bookmark4", NULL, NULL,
- BOOKMARK4_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
- add_string( "bookmark5", NULL, NULL,
- BOOKMARK5_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
- add_string( "bookmark6", NULL, NULL,
- BOOKMARK6_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
- add_string( "bookmark7", NULL, NULL,
- BOOKMARK7_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
- add_string( "bookmark8", NULL, NULL,
- BOOKMARK8_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
- add_string( "bookmark9", NULL, NULL,
- BOOKMARK9_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
- add_string( "bookmark10", NULL, NULL,
- BOOKMARK10_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
-
+ set_shortname( N_("Hotkeys") );
+ set_description( N_("Hotkeys management interface") );
set_capability( "interface", 0 );
set_callbacks( Open, Close );
vlc_module_end();
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_vlc, "key-pressed", KeyEvent, p_intf );
- return 0;
+ var_AddCallback( p_intf->p_libvlc, "key-pressed", SpecialKeyEvent, p_intf );
+ var_AddCallback( p_intf->p_libvlc, "key-action", ActionEvent, p_intf );
+ return VLC_SUCCESS;
}
/*****************************************************************************
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
- 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 );
- }
+ var_DelCallback( p_intf->p_libvlc, "key-action", ActionEvent, p_intf );
+ var_DelCallback( p_intf->p_libvlc, "key-pressed", SpecialKeyEvent, p_intf );
+
/* Destroy structure */
free( p_intf->p_sys );
}
*****************************************************************************/
static void Run( intf_thread_t *p_intf )
{
- playlist_t *p_playlist;
- input_thread_t *p_input;
vout_thread_t *p_vout = NULL;
- vout_thread_t *p_last_vout;
- struct hotkey *p_hotkeys = p_intf->p_vlc->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++ )
+ for( struct hotkey *p_hotkey = p_intf->p_libvlc->p_hotkeys;
+ p_hotkey->psz_action != NULL;
+ p_hotkey++ )
{
- var_Create( p_intf->p_vlc, p_hotkeys[i].psz_action,
- VLC_VAR_HOTKEY | VLC_VAR_DOINHERIT );
-
- var_AddCallback( p_intf->p_vlc, p_hotkeys[i].psz_action,
- ActionKeyCB, NULL );
- var_Get( p_intf->p_vlc, p_hotkeys[i].psz_action, &val );
- var_Set( p_intf->p_vlc, p_hotkeys[i].psz_action, val );
+ p_hotkey->i_key = config_GetInt( p_intf, p_hotkey->psz_action );
}
- while( !p_intf->b_die )
+ for( ;; )
{
- int i_key, i_action;
+ input_thread_t *p_input;
+ vout_thread_t *p_last_vout;
+ int i_action = GetAction( p_intf );
- /* Sleep a bit */
- msleep( INTF_IDLE_SLEEP );
+ if( i_action == -1 )
+ break; /* die */
/* Update the input */
- if( p_intf->p_sys->p_input == NULL )
- {
- p_intf->p_sys->p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
- }
- else if( p_intf->p_sys->p_input->b_dead )
- {
- vlc_object_release( p_intf->p_sys->p_input );
- p_intf->p_sys->p_input = NULL;
- }
- p_input = p_intf->p_sys->p_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 )
{
for( i = 0; i < CHANNELS_NUMBER; i++ )
{
- p_intf->p_sys->p_channels[ i ] =
- vout_RegisterOSDChannel( p_vout );
- }
- }
-
- /* Find action triggered by hotkey */
- i_action = 0;
- i_key = GetKey( p_intf );
- for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
- {
- if( p_hotkeys[i].i_key == i_key )
- {
- i_action = p_hotkeys[i].i_action;
+ spu_Control( p_vout->p_spu, SPU_CHANNEL_REGISTER,
+ &p_intf->p_sys->p_channels[ i ] );
}
}
- if( !i_action )
- {
- /* No key pressed, sleep a bit more */
- msleep( INTF_IDLE_SLEEP );
- continue;
- }
-
+ /* Quit */
if( i_action == ACTIONID_QUIT )
{
- p_intf->p_vlc->b_die = VLC_TRUE;
+ if( p_playlist )
+ playlist_Stop( p_playlist );
+ vlc_object_kill( p_intf->p_libvlc );
+ vlc_object_kill( p_intf );
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;
}
+ /* Volume and audio actions */
else if( i_action == ACTIONID_VOL_UP )
{
audio_volume_t i_newvol;
}
}
}
-
- else if( i_action == ACTIONID_SUBDELAY_DOWN )
+ /* Interface showing */
+ else if( i_action == ACTIONID_INTF_SHOW )
+ var_SetBool( p_intf->p_libvlc, "intf-show", true );
+ else if( i_action == ACTIONID_INTF_HIDE )
+ var_SetBool( p_intf->p_libvlc, "intf-show", false );
+ /* Video Output actions */
+ else if( i_action == ACTIONID_SNAPSHOT )
{
- int64_t i_delay = var_GetTime( p_input, "spu-delay" );
-
- i_delay -= 10000; /* 10 ms */
-
- var_SetTime( p_input, "spu-delay", i_delay );
- ClearChannels( p_intf, p_vout );
- vout_OSDMessage( p_intf, DEFAULT_CHAN, "Subtitle delay %i ms",
- (int)(i_delay/1000) );
+ if( p_vout ) vout_Control( p_vout, VOUT_SNAPSHOT );
}
- else if( i_action == ACTIONID_SUBDELAY_UP )
+ else if( i_action == ACTIONID_TOGGLE_FULLSCREEN )
{
- int64_t i_delay = var_GetTime( p_input, "spu-delay" );
-
- i_delay += 10000; /* 10 ms */
-
- var_SetTime( p_input, "spu-delay", i_delay );
- ClearChannels( p_intf, p_vout );
- vout_OSDMessage( p_intf, DEFAULT_CHAN, "Subtitle delay %i ms",
- (int)(i_delay/1000) );
+ if( p_vout )
+ {
+ var_Get( p_vout, "fullscreen", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_vout, "fullscreen", val );
+ }
+ else
+ {
+ var_Get( p_playlist, "fullscreen", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "fullscreen", val );
+ }
}
- else if( i_action == ACTIONID_FULLSCREEN && p_vout )
+ else if( i_action == ACTIONID_LEAVE_FULLSCREEN )
{
- var_Get( p_vout, "fullscreen", &val );
- var_Set( p_vout, "fullscreen", (vlc_value_t)!val.b_bool );
+ if( p_vout && var_GetBool( p_vout, "fullscreen" ) )
+ {
+ var_SetBool( p_vout, "fullscreen", false );
+ }
}
- else if( i_action == ACTIONID_PLAY )
+ else if( i_action == ACTIONID_ZOOM_QUARTER ||
+ i_action == ACTIONID_ZOOM_HALF ||
+ i_action == ACTIONID_ZOOM_ORIGINAL ||
+ i_action == ACTIONID_ZOOM_DOUBLE )
{
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
+ if( p_vout )
{
- playlist_Play( p_playlist );
- vlc_object_release( p_playlist );
+ if( i_action == ACTIONID_ZOOM_QUARTER )
+ val.f_float = 0.25;
+ if( i_action == ACTIONID_ZOOM_HALF )
+ val.f_float = 0.5;
+ if( i_action == ACTIONID_ZOOM_ORIGINAL )
+ val.f_float = 1;
+ if( i_action == ACTIONID_ZOOM_DOUBLE )
+ val.f_float = 2;
+ var_Set( p_vout, "zoom", val );
+ }
+ }
+ else if( i_action == ACTIONID_WALLPAPER )
+ {
+ if( p_vout )
+ {
+ var_Get( p_vout, "directx-wallpaper", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_vout, "directx-wallpaper", val );
+ }
+ else
+ {
+ var_Get( p_playlist, "directx-wallpaper", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "directx-wallpaper", val );
+ }
+ }
+ /* Playlist actions */
+ 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 == true )
+ {
+ val.b_bool = false;
+ val2.b_bool = false;
+ }
+ else if( val.b_bool == true )
+ {
+ val.b_bool = false;
+ val2.b_bool = true;
+ }
+ else
+ {
+ val.b_bool = 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 )
{
val.i_int = PLAYING_S;
if( p_input )
- {
- var_Get( p_input, "state", &val );
- }
- if( p_input && val.i_int != PAUSE_S )
{
ClearChannels( p_intf, p_vout );
- vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
- OSD_PAUSE_ICON );
- val.i_int = PAUSE_S;
+
+ var_Get( p_input, "state", &val );
+ if( val.i_int != PAUSE_S )
+ {
+ vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
+ OSD_PAUSE_ICON );
+ val.i_int = PAUSE_S;
+ }
+ else
+ {
+ vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
+ OSD_PLAY_ICON );
+ val.i_int = PLAYING_S;
+ }
var_Set( p_input, "state", val );
}
else
{
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
+ playlist_Play( p_playlist );
+ }
+ }
+ else if( i_action == ACTIONID_AUDIODEVICE_CYCLE )
+ {
+ vlc_value_t val, list, list2;
+ int i_count, i;
+
+ aout_instance_t *p_aout =
+ vlc_object_find( p_intf, VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ var_Get( p_aout, "audio-device", &val );
+ var_Change( p_aout, "audio-device", VLC_VAR_GETCHOICES,
+ &list, &list2 );
+ i_count = list.p_list->i_count;
+
+ /* Not enough device to switch between */
+ if( i_count <= 1 )
+ continue;
+
+ for( i = 0; i < i_count; i++ )
+ {
+ if( val.i_int == list.p_list->p_values[i].i_int )
{
- 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 );
+ break;
}
}
+ if( i == i_count )
+ {
+ msg_Warn( p_aout,
+ "invalid current audio device, selecting 0" );
+ var_Set( p_aout, "audio-device",
+ list.p_list->p_values[0] );
+ i = 0;
+ }
+ else if( i == i_count -1 )
+ {
+ var_Set( p_aout, "audio-device",
+ list.p_list->p_values[0] );
+ i = 0;
+ }
+ else
+ {
+ var_Set( p_aout, "audio-device",
+ list.p_list->p_values[i+1] );
+ i++;
+ }
+ vout_OSDMessage( p_intf, DEFAULT_CHAN,
+ _("Audio Device: %s"),
+ list2.p_list->p_values[i].psz_string);
+ vlc_object_release( p_aout );
}
+ /* Input options */
else if( p_input )
{
- /* FIXME --fenrir
- * How to get a valid value ?
- * That's not that easy with some special stream
- */
- vlc_bool_t b_seekable = VLC_TRUE;
+ bool b_seekable = var_GetBool( p_input, "seekable" );
+ int i_interval =0;
if( i_action == ACTIONID_PAUSE )
{
- ClearChannels( p_intf, p_vout );
- vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
- OSD_PAUSE_ICON );
- val.i_int = PAUSE_S;
- var_Set( p_input, "state", val );
+ var_Get( p_input, "state", &val );
+ if( val.i_int != PAUSE_S )
+ {
+ ClearChannels( p_intf, p_vout );
+ vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
+ OSD_PAUSE_ICON );
+ val.i_int = PAUSE_S;
+ var_Set( p_input, "state", val );
+ }
}
- else if( i_action == ACTIONID_JUMP_BACKWARD_10SEC && b_seekable )
+ else if( i_action == ACTIONID_JUMP_BACKWARD_EXTRASHORT
+ && b_seekable )
{
- val.i_time = -10000000;
- var_Set( p_input, "time-offset", val );
- DisplayPosition( p_intf, p_vout, p_input );
+#define SET_TIME( a, b ) \
+ i_interval = config_GetInt( p_input, a "-jump-size" ); \
+ if( i_interval > 0 ) { \
+ val.i_time = (mtime_t)(i_interval * b) * 1000000L; \
+ var_Set( p_input, "time-offset", val ); \
+ DisplayPosition( p_intf, p_vout, p_input ); \
+ }
+ SET_TIME( "extrashort", -1 );
}
- else if( i_action == ACTIONID_JUMP_FORWARD_10SEC && b_seekable )
+ else if( i_action == ACTIONID_JUMP_FORWARD_EXTRASHORT && b_seekable )
{
- val.i_time = 10000000;
- var_Set( p_input, "time-offset", val );
- DisplayPosition( p_intf, p_vout, p_input );
+ SET_TIME( "extrashort", 1 );
}
- else if( i_action == ACTIONID_JUMP_BACKWARD_1MIN && b_seekable )
+ else if( i_action == ACTIONID_JUMP_BACKWARD_SHORT && b_seekable )
{
- val.i_time = -60000000;
- var_Set( p_input, "time-offset", val );
- DisplayPosition( p_intf, p_vout, p_input );
+ SET_TIME( "short", -1 );
}
- else if( i_action == ACTIONID_JUMP_FORWARD_1MIN && b_seekable )
+ else if( i_action == ACTIONID_JUMP_FORWARD_SHORT && b_seekable )
{
- val.i_time = 60000000;
- var_Set( p_input, "time-offset", val );
- DisplayPosition( p_intf, p_vout, p_input );
+ SET_TIME( "short", 1 );
}
- else if( i_action == ACTIONID_JUMP_BACKWARD_5MIN && b_seekable )
+ else if( i_action == ACTIONID_JUMP_BACKWARD_MEDIUM && b_seekable )
{
- val.i_time = -300000000;
- var_Set( p_input, "time-offset", val );
- DisplayPosition( p_intf, p_vout, p_input );
+ SET_TIME( "medium", -1 );
}
- else if( i_action == ACTIONID_JUMP_FORWARD_5MIN && b_seekable )
+ else if( i_action == ACTIONID_JUMP_FORWARD_MEDIUM && b_seekable )
{
- val.i_time = 300000000;
- var_Set( p_input, "time-offset", val );
- DisplayPosition( p_intf, p_vout, p_input );
+ SET_TIME( "medium", 1 );
}
- else if( i_action == ACTIONID_NEXT )
+ else if( i_action == ACTIONID_JUMP_BACKWARD_LONG && b_seekable )
{
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
+ SET_TIME( "long", -1 );
+ }
+ else if( i_action == ACTIONID_JUMP_FORWARD_LONG && b_seekable )
+ {
+ SET_TIME( "long", 1 );
+#undef SET_TIME
+ }
+ else if( i_action == ACTIONID_AUDIO_TRACK )
+ {
+ vlc_value_t val, list, list2;
+ int i_count, i;
+ var_Get( p_input, "audio-es", &val );
+ var_Change( p_input, "audio-es", VLC_VAR_GETCHOICES,
+ &list, &list2 );
+ i_count = list.p_list->i_count;
+ if( i_count <= 1 )
+ {
+ continue;
+ }
+ for( i = 0; i < i_count; i++ )
+ {
+ if( val.i_int == list.p_list->p_values[i].i_int )
+ {
+ break;
+ }
+ }
+ /* value of audio-es was not in choices list */
+ if( i == i_count )
{
- playlist_Next( p_playlist );
- vlc_object_release( p_playlist );
+ msg_Warn( p_input,
+ "invalid current audio track, selecting 0" );
+ var_Set( p_input, "audio-es",
+ list.p_list->p_values[0] );
+ i = 0;
}
+ else if( i == i_count - 1 )
+ {
+ var_Set( p_input, "audio-es",
+ list.p_list->p_values[1] );
+ i = 1;
+ }
+ else
+ {
+ var_Set( p_input, "audio-es",
+ list.p_list->p_values[i+1] );
+ i++;
+ }
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ _("Audio track: %s"),
+ list2.p_list->p_values[i].psz_string );
}
- else if( i_action == ACTIONID_PREV )
+ else if( i_action == ACTIONID_SUBTITLE_TRACK )
+ {
+ vlc_value_t val, list, list2;
+ int i_count, i;
+ var_Get( p_input, "spu-es", &val );
+
+ var_Change( p_input, "spu-es", VLC_VAR_GETCHOICES,
+ &list, &list2 );
+ i_count = list.p_list->i_count;
+ if( i_count <= 1 )
+ {
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ _("Subtitle track: %s"), _("N/A") );
+ continue;
+ }
+ for( i = 0; i < i_count; i++ )
+ {
+ if( val.i_int == list.p_list->p_values[i].i_int )
+ {
+ break;
+ }
+ }
+ /* value of spu-es was not in choices list */
+ if( i == i_count )
+ {
+ msg_Warn( p_input,
+ "invalid current subtitle track, selecting 0" );
+ var_Set( p_input, "spu-es", list.p_list->p_values[0] );
+ i = 0;
+ }
+ else if( i == i_count - 1 )
+ {
+ var_Set( p_input, "spu-es", list.p_list->p_values[0] );
+ i = 0;
+ }
+ else
+ {
+ var_Set( p_input, "spu-es", list.p_list->p_values[i+1] );
+ i = i + 1;
+ }
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ _("Subtitle track: %s"),
+ list2.p_list->p_values[i].psz_string );
+ }
+ else if( i_action == ACTIONID_ASPECT_RATIO && p_vout )
{
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
+ vlc_value_t val={0}, val_list, text_list;
+ var_Get( p_vout, "aspect-ratio", &val );
+ if( var_Change( p_vout, "aspect-ratio", VLC_VAR_GETLIST,
+ &val_list, &text_list ) >= 0 )
{
- playlist_Prev( p_playlist );
- vlc_object_release( p_playlist );
+ int i;
+ for( i = 0; i < val_list.p_list->i_count; i++ )
+ {
+ if( !strcmp( val_list.p_list->p_values[i].psz_string,
+ val.psz_string ) )
+ {
+ i++;
+ break;
+ }
+ }
+ if( i == val_list.p_list->i_count ) i = 0;
+ var_SetString( p_vout, "aspect-ratio",
+ val_list.p_list->p_values[i].psz_string );
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ _("Aspect ratio: %s"),
+ text_list.p_list->p_values[i].psz_string );
+
+ var_Change( p_vout, "aspect-ratio", VLC_VAR_FREELIST, &val_list, &text_list );
}
+ free( val.psz_string );
}
- else if( i_action == ACTIONID_STOP )
+ else if( i_action == ACTIONID_CROP && p_vout )
+ {
+ vlc_value_t val={0}, val_list, text_list;
+ var_Get( p_vout, "crop", &val );
+ if( var_Change( p_vout, "crop", VLC_VAR_GETLIST,
+ &val_list, &text_list ) >= 0 )
+ {
+ int i;
+ for( i = 0; i < val_list.p_list->i_count; i++ )
+ {
+ if( !strcmp( val_list.p_list->p_values[i].psz_string,
+ val.psz_string ) )
+ {
+ i++;
+ break;
+ }
+ }
+ if( i == val_list.p_list->i_count ) i = 0;
+ var_SetString( p_vout, "crop",
+ val_list.p_list->p_values[i].psz_string );
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ _("Crop: %s"),
+ text_list.p_list->p_values[i].psz_string );
+
+ var_Change( p_vout, "crop", VLC_VAR_FREELIST, &val_list, &text_list );
+ }
+ free( val.psz_string );
+ }
+ else if( i_action == ACTIONID_DEINTERLACE && p_vout )
{
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
+ vlc_value_t val={0}, val_list, text_list;
+ var_Get( p_vout, "deinterlace", &val );
+ if( var_Change( p_vout, "deinterlace", VLC_VAR_GETLIST,
+ &val_list, &text_list ) >= 0 )
{
- playlist_Stop( p_playlist );
- vlc_object_release( p_playlist );
+ int i;
+ for( i = 0; i < val_list.p_list->i_count; i++ )
+ {
+ if( !strcmp( val_list.p_list->p_values[i].psz_string,
+ val.psz_string ) )
+ {
+ i++;
+ break;
+ }
+ }
+ if( i == val_list.p_list->i_count ) i = 0;
+ var_SetString( p_vout, "deinterlace",
+ val_list.p_list->p_values[i].psz_string );
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ _("Deinterlace mode: %s"),
+ text_list.p_list->p_values[i].psz_string );
+
+ var_Change( p_vout, "deinterlace", VLC_VAR_FREELIST, &val_list, &text_list );
}
+ free( val.psz_string );
+ }
+ 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 );
+ if( var_Change( p_vout, "zoom", VLC_VAR_GETLIST,
+ &val_list, &text_list ) >= 0 )
+ {
+ int i;
+ for( i = 0; i < val_list.p_list->i_count; i++ )
+ {
+ if( val_list.p_list->p_values[i].f_float
+ == val.f_float )
+ {
+ if( i_action == ACTIONID_ZOOM )
+ i++;
+ else /* ACTIONID_UNZOOM */
+ i--;
+ break;
+ }
+ }
+ if( i == val_list.p_list->i_count ) i = 0;
+ if( i == -1 ) i = val_list.p_list->i_count-1;
+ var_SetFloat( p_vout, "zoom",
+ val_list.p_list->p_values[i].f_float );
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ _("Zoom mode: %s"),
+ text_list.p_list->p_values[i].var.psz_name );
+
+ var_Change( p_vout, "zoom", VLC_VAR_FREELIST, &val_list, &text_list );
+ }
+ }
+ else if( i_action == ACTIONID_CROP_TOP && p_vout )
+ var_IncInteger( p_vout, "crop-top" );
+ else if( i_action == ACTIONID_UNCROP_TOP && p_vout )
+ var_DecInteger( p_vout, "crop-top" );
+ else if( i_action == ACTIONID_CROP_BOTTOM && p_vout )
+ var_IncInteger( p_vout, "crop-bottom" );
+ else if( i_action == ACTIONID_UNCROP_BOTTOM && p_vout )
+ var_DecInteger( p_vout, "crop-bottom" );
+ else if( i_action == ACTIONID_CROP_LEFT && p_vout )
+ var_IncInteger( p_vout, "crop-left" );
+ else if( i_action == ACTIONID_UNCROP_LEFT && p_vout )
+ var_DecInteger( p_vout, "crop-left" );
+ else if( i_action == ACTIONID_CROP_RIGHT && p_vout )
+ var_IncInteger( p_vout, "crop-right" );
+ else if( i_action == ACTIONID_UNCROP_RIGHT && p_vout )
+ var_DecInteger( p_vout, "crop-right" );
+
+ else if( i_action == ACTIONID_NEXT )
+ {
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, _("Next") );
+ playlist_Next( p_playlist );
+ }
+ else if( i_action == ACTIONID_PREV )
+ {
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ _("Previous") );
+ playlist_Prev( p_playlist );
+ }
+ else if( i_action == ACTIONID_STOP )
+ {
+ 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") );
}
else if( i_action == ACTIONID_POSITION && b_seekable )
{
{
SetBookmark( p_intf, i_action - ACTIONID_SET_BOOKMARK1 + 1 );
}
+ /* Only makes sense with DVD */
+ else if( i_action == ACTIONID_TITLE_PREV )
+ var_SetVoid( p_input, "prev-title" );
+ else if( i_action == ACTIONID_TITLE_NEXT )
+ var_SetVoid( p_input, "next-title" );
+ else if( i_action == ACTIONID_CHAPTER_PREV )
+ var_SetVoid( p_input, "prev-chapter" );
+ else if( i_action == ACTIONID_CHAPTER_NEXT )
+ var_SetVoid( p_input, "next-chapter" );
+ else if( i_action == ACTIONID_DISC_MENU )
+ 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" ),
+ (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" ),
+ (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" ),
+ (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" ),
+ (int)(i_delay/1000) );
+ }
+ else if( i_action == ACTIONID_PLAY )
+ {
+ var_Get( p_input, "rate", &val );
+ if( val.i_int != INPUT_RATE_DEFAULT )
+ {
+ /* 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 );
+ }
+ }
+ else if( i_action == ACTIONID_MENU_ON )
+ {
+ osd_MenuShow( VLC_OBJECT(p_intf) );
+ }
+ else if( i_action == ACTIONID_MENU_OFF )
+ {
+ osd_MenuHide( VLC_OBJECT(p_intf) );
+ }
+ else if( i_action == ACTIONID_MENU_LEFT )
+ {
+ osd_MenuPrev( VLC_OBJECT(p_intf) );
+ }
+ else if( i_action == ACTIONID_MENU_RIGHT )
+ {
+ osd_MenuNext( VLC_OBJECT(p_intf) );
+ }
+ else if( i_action == ACTIONID_MENU_UP )
+ {
+ osd_MenuUp( VLC_OBJECT(p_intf) );
+ }
+ else if( i_action == ACTIONID_MENU_DOWN )
+ {
+ osd_MenuDown( VLC_OBJECT(p_intf) );
+ }
+ else if( i_action == ACTIONID_MENU_SELECT )
+ {
+ osd_MenuActivate( VLC_OBJECT(p_intf) );
+ }
}
+ 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)
+static int GetAction( intf_thread_t *p_intf )
{
- vlc_mutex_lock( &p_intf->p_sys->change_lock );
- if ( p_intf->p_sys->i_size == 0 )
+ intf_sys_t *p_sys = p_intf->p_sys;
+ int i_ret = -1;
+
+ vlc_object_lock( p_intf );
+ while( p_sys->i_size == 0 )
{
- vlc_mutex_unlock( &p_intf->p_sys->change_lock );
- return -1;
+ if( !vlc_object_alive( p_intf ) )
+ goto out;
+ vlc_object_wait( p_intf );
}
+
+ 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];
+
+out:
+ vlc_object_unlock( p_intf );
+ 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_object_lock( p_intf );
+ if ( p_sys->i_size >= BUFFER_SIZE )
+ msg_Warn( p_intf, "event buffer full, dropping key actions" );
else
- {
- int i_return = p_intf->p_sys->p_keys[ 0 ];
- int i;
- p_intf->p_sys->i_size--;
- for ( i = 0; i < BUFFER_SIZE - 1; i++)
- {
- p_intf->p_sys->p_keys[ i ] = p_intf->p_sys->p_keys[ i + 1 ];
- }
- vlc_mutex_unlock( &p_intf->p_sys->change_lock );
- return i_return;
- }
+ p_sys->p_actions[p_sys->i_size++] = i_action;
+
+ vlc_object_signal_unlocked( p_intf );
+ vlc_object_unlock( p_intf );
+ return i_ret;
}
/*****************************************************************************
- * KeyEvent: callback for keyboard events
+ * SpecialKeyEvent: callback for mouse events
*****************************************************************************/
-static int KeyEvent( vlc_object_t *p_this, char const *psz_var,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+static int SpecialKeyEvent( vlc_object_t *libvlc, char const *psz_var,
+ vlc_value_t oldval, vlc_value_t newval,
+ void *p_data )
{
intf_thread_t *p_intf = (intf_thread_t *)p_data;
- vlc_mutex_lock( &p_intf->p_sys->change_lock );
- if ( p_intf->p_sys->i_size == BUFFER_SIZE )
- {
- msg_Warn( p_intf, "event buffer full, dropping keypress" );
- vlc_mutex_unlock( &p_intf->p_sys->change_lock );
- return VLC_EGENERIC;
- }
- else
+ int i_action;
+
+ (void)libvlc;
+ (void)psz_var;
+ (void)oldval;
+
+ /* 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 (newval.i_int & KEY_SPECIAL)
{
- p_intf->p_sys->p_keys[ p_intf->p_sys->i_size ] = newval.i_int;
- p_intf->p_sys->i_size++;
+ 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:
+ return VLC_SUCCESS;
}
- vlc_mutex_unlock( &p_intf->p_sys->change_lock );
- return VLC_SUCCESS;
+ return PutAction( p_intf, i_action );
}
-static int ActionKeyCB( vlc_object_t *p_this, char const *psz_var,
+/*****************************************************************************
+ * ActionEvent: callback for hotkey actions
+ *****************************************************************************/
+static int ActionEvent( vlc_object_t *libvlc, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- vlc_t *p_vlc = (vlc_t *)p_this;
- struct hotkey *p_hotkeys = p_vlc->p_hotkeys;
- int i;
+ intf_thread_t *p_intf = (intf_thread_t *)p_data;
- for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
- {
- if( !strcmp( p_hotkeys[i].psz_action, psz_var ) )
- {
- p_hotkeys[i].i_key = newval.i_int;
- }
- }
+ (void)libvlc;
+ (void)psz_var;
+ (void)oldval;
- return VLC_SUCCESS;
+ return PutAction( p_intf, newval.i_int );
}
static void PlayBookmark( intf_thread_t *p_intf, int i_num )
{
vlc_value_t val;
- int i_position;
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_position = 0; i_position < p_playlist->i_size; i_position++)
+ char *psz_bookmark = strdup( val.psz_string );
+ PL_LOCK;
+ FOREACH_ARRAY( playlist_item_t *p_item, p_playlist->items )
+ char *psz_uri = input_item_GetURI( p_item->p_input );
+ if( !strcmp( psz_bookmark, psz_uri ) )
{
- if( !strcmp( psz_bookmark,
- p_playlist->pp_items[i_position]->input.psz_uri ) )
- {
- playlist_Goto( p_playlist, i_position );
- break;
- }
+ free( psz_uri );
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked,
+ NULL, p_item );
+ break;
}
- vlc_object_release( p_playlist );
- }
+ else
+ free( psz_uri );
+ FOREACH_END();
+ PL_UNLOCK;
+ vlc_object_release( p_playlist );
}
static void SetBookmark( intf_thread_t *p_intf, int i_num )
{
- vlc_value_t val;
- 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 );
- val.psz_string = strdup( p_playlist->pp_items[p_playlist->i_index]->input.psz_uri );
- var_Set( p_intf, psz_bookmark_name, val );
- msg_Info( p_intf, "setting playlist bookmark %i to %s", i_num,
- val.psz_string );
- vlc_object_release( p_playlist );
+ char *psz_uri = input_item_GetURI( p_playlist->status.p_item->p_input );
+ config_PutPsz( p_intf, psz_bookmark_name, psz_uri);
+ msg_Info( p_intf, "setting playlist bookmark %i to %s", i_num, psz_uri);
+ free( 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 )
vout_OSDMessage( p_input, POSITION_TEXT_CHAN, psz_time );
}
- if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
+ if( !p_vout->p_window || p_vout->b_fullscreen )
{
var_Get( p_input, "position", &pos );
vout_OSDSlider( VLC_OBJECT( p_input ), POSITION_WIDGET_CHAN,
}
ClearChannels( p_intf, p_vout );
- if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
+ if( !p_vout->p_window || p_vout->b_fullscreen )
{
vout_OSDSlider( VLC_OBJECT( p_vout ), VOLUME_WIDGET_CHAN,
i_vol*100/AOUT_VOLUME_MAX, OSD_VERT_SLIDER );
}
else
{
- vout_OSDMessage( p_vout, VOLUME_TEXT_CHAN, "Vol %d%%",
- 2*i_vol*100/AOUT_VOLUME_MAX );
+ vout_OSDMessage( p_vout, VOLUME_TEXT_CHAN, _( "Volume %d%%" ),
+ i_vol*400/AOUT_VOLUME_MAX );
}
}
if( p_vout )
{
- vout_ClearOSDChannel( p_vout, DEFAULT_CHAN );
+ spu_Control( p_vout->p_spu, SPU_CHANNEL_CLEAR, DEFAULT_CHAN );
for( i = 0; i < CHANNELS_NUMBER; i++ )
{
- vout_ClearOSDChannel( p_vout, p_intf->p_sys->p_channels[ i ] );
+ spu_Control( p_vout->p_spu, SPU_CHANNEL_CLEAR,
+ p_intf->p_sys->p_channels[ i ] );
}
}
}
projects / vlc / blobdiff