/*****************************************************************************
* hotkeys.c: Hotkey handling for vlc
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2005-2009 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_keys.h"
+#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>
+#include "math.h"
+
+#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 ]
+#define POSITION_TEXT_CHAN p_intf->p_sys->p_channels[ 2 ]
+#define POSITION_WIDGET_CHAN p_intf->p_sys->p_channels[ 3 ]
-#define BUFFER_SIZE 10
/*****************************************************************************
* intf_sys_t: description and status of FB interface
*****************************************************************************/
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 i_size; /* number of events in buffer */
- input_thread_t * p_input; /* pointer to input */
- vout_thread_t * p_vout; /* pointer to vout object */
+ vout_thread_t *p_last_vout;
+ int p_channels[ CHANNELS_NUMBER ]; /* contains registered
+ * channel IDs */
+ int i_mousewheel_mode;
};
/*****************************************************************************
*****************************************************************************/
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 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 int GetPosition ( intf_thread_t * );
+static void DisplayPosition( intf_thread_t *, vout_thread_t *, input_thread_t * );
+static void DisplayVolume ( intf_thread_t *, vout_thread_t *, audio_volume_t );
+static void ClearChannels ( intf_thread_t *, vout_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.")
-
-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_capability( "interface", 0 );
- set_callbacks( Open, Close );
-vlc_module_end();
+
+enum{
+ MOUSEWHEEL_VOLUME,
+ MOUSEWHEEL_POSITION,
+ NO_MOUSEWHEEL,
+};
+
+static const int i_mode_list[] =
+ { MOUSEWHEEL_VOLUME, MOUSEWHEEL_POSITION, NO_MOUSEWHEEL };
+
+static const char *const psz_mode_list_text[] =
+ { N_("Volume Control"), N_("Position Control"), N_("Ignore") };
+
+vlc_module_begin ()
+ set_shortname( N_("Hotkeys") )
+ 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"),
+ N_("MouseWheel x-axis can control volume, position or "
+ "mousewheel event can be ignored"), false )
+ change_integer_list( i_mode_list, psz_mode_list_text, NULL )
+
+vlc_module_end ()
/*****************************************************************************
* Open: initialize interface
static int Open( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
+ intf_sys_t *p_sys;
+ p_sys = malloc( sizeof( intf_sys_t ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
- /* 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_sys;
+ p_intf->pf_run = NULL;
- p_intf->p_sys->p_input = NULL;
- p_intf->p_sys->p_vout = NULL;
+ p_sys->p_last_vout = NULL;
+ p_intf->p_sys->i_mousewheel_mode =
+ config_GetInt( p_intf, "hotkeys-mousewheel-mode" );
- 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;
}
/*****************************************************************************
static void Close( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
+ intf_sys_t *p_sys = p_intf->p_sys;
+
+ var_DelCallback( p_intf->p_libvlc, "key-action", ActionEvent, p_intf );
+ var_DelCallback( p_intf->p_libvlc, "key-pressed", SpecialKeyEvent, 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 );
- }
/* 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 )
{
- playlist_t *p_playlist;
- input_thread_t *p_input;
- vout_thread_t *p_vout = NULL;
- struct hotkey *p_hotkeys = p_intf->p_vlc->p_hotkeys;
- vlc_value_t val;
- int i;
+ intf_sys_t *p_sys = p_intf->p_sys;
+ playlist_t *p_playlist = pl_Hold( p_intf );
- /* Initialize hotkey structure */
- for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
- {
- var_Create( p_intf->p_vlc, p_hotkeys[i].psz_action,
- VLC_VAR_HOTKEY | VLC_VAR_DOINHERIT );
+ /* Update the input */
+ input_thread_t *p_input = playlist_CurrentInput( p_playlist );
- 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 );
- }
+ /* Update the vout */
+ vout_thread_t *p_vout = p_input ? input_GetVout( p_input ) : NULL;
+
+ /* Update the aout */
+ aout_instance_t *p_aout = p_input ? input_GetAout( p_input ) : NULL;
- while( !p_intf->b_die )
+ /* 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 */
+ switch( i_action )
{
- int i_key, i_action;
+ case ACTIONID_QUIT:
+ libvlc_Quit( p_intf->p_libvlc );
- /* Sleep a bit */
- msleep( INTF_IDLE_SLEEP );
+ ClearChannels( p_intf, p_vout );
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Quit" ) );
+ break;
- /* 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 )
+ /* Volume and audio actions */
+ case ACTIONID_VOL_UP:
{
- vlc_object_release( p_intf->p_sys->p_input );
- p_intf->p_sys->p_input = NULL;
+ audio_volume_t i_newvol;
+ aout_VolumeUp( p_playlist, 1, &i_newvol );
+ DisplayVolume( p_intf, p_vout, i_newvol );
+ break;
}
- p_input = p_intf->p_sys->p_input;
- /* Update the 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 )
+ case ACTIONID_VOL_DOWN:
{
- vlc_object_release( p_vout );
- p_vout = NULL;
- p_intf->p_sys->p_vout = NULL;
+ audio_volume_t i_newvol;
+ aout_VolumeDown( p_playlist, 1, &i_newvol );
+ DisplayVolume( p_intf, p_vout, i_newvol );
+ break;
}
- /* Find action triggered by hotkey */
- i_action = 0;
- i_key = GetKey( p_intf );
- for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
+ case ACTIONID_VOL_MUTE:
{
- if( p_hotkeys[i].i_key == i_key )
+ audio_volume_t i_newvol = -1;
+ aout_ToggleMute( p_playlist, &i_newvol );
+ if( p_vout )
{
- i_action = p_hotkeys[i].i_action;
+ if( i_newvol == 0 )
+ {
+ ClearChannels( p_intf, p_vout );
+ vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
+ OSD_MUTE_ICON );
+ }
+ else
+ DisplayVolume( p_intf, p_vout, i_newvol );
}
+ break;
}
- if( !i_action )
- {
- /* No key pressed, sleep a bit more */
- msleep( INTF_IDLE_SLEEP );
- continue;
- }
+ /* Interface showing */
+ case ACTIONID_INTF_SHOW:
+ var_SetBool( p_intf->p_libvlc, "intf-show", true );
+ break;
+
+ case ACTIONID_INTF_HIDE:
+ var_SetBool( p_intf->p_libvlc, "intf-show", false );
+ break;
- if( i_action == ACTIONID_QUIT )
+ /* Video Output actions */
+ case ACTIONID_SNAPSHOT:
+ if( p_vout )
+ var_TriggerCallback( p_vout, "video-snapshot" );
+ break;
+
+ case ACTIONID_TOGGLE_FULLSCREEN:
{
- p_intf->p_vlc->b_die = VLC_TRUE;
- vout_OSDMessage( p_intf, _( "Quit" ) );
- continue;
+ vlc_object_t *obj = p_vout ? VLC_OBJECT(p_vout)
+ : VLC_OBJECT(p_playlist);
+ var_ToggleBool( obj, "fullscreen" );
+ break;
}
- else if( i_action == ACTIONID_VOL_UP )
- {
- audio_volume_t i_newvol;
- aout_VolumeUp( p_intf, 1, &i_newvol );
- if( p_vout->b_fullscreen )
+
+ case ACTIONID_LEAVE_FULLSCREEN:
+ if( p_vout && var_GetBool( p_vout, "fullscreen" ) )
+ var_SetBool( p_vout, "fullscreen", false );
+ break;
+
+ case ACTIONID_ZOOM_QUARTER:
+ case ACTIONID_ZOOM_HALF:
+ case ACTIONID_ZOOM_ORIGINAL:
+ case ACTIONID_ZOOM_DOUBLE:
+ if( p_vout )
{
- vout_OSDSlider( VLC_OBJECT( p_intf ),
- i_newvol*100/AOUT_VOLUME_MAX, 1 );
+ float f;
+ switch( i_action )
+ {
+ case ACTIONID_ZOOM_QUARTER: f = 0.25; break;
+ case ACTIONID_ZOOM_HALF: f = 0.5; break;
+ case ACTIONID_ZOOM_ORIGINAL: f = 1.; break;
+ /*case ACTIONID_ZOOM_DOUBLE:*/
+ default: f = 2.; break;
+ }
+ var_SetFloat( p_vout, "zoom", f );
}
+ break;
+
+#ifdef WIN32
+ 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);
+ var_ToggleBool( obj, "directx-wallpaper" );
+ }
+#endif
+
+ /* Playlist actions */
+ case ACTIONID_LOOP:
+ /* Toggle Normal -> Loop -> Repeat -> Normal ... */
+ if( var_GetBool( p_playlist, "repeat" ) )
+ var_SetBool( p_playlist, "repeat", false );
else
- {
- vout_OSDMessage( p_intf, "Vol %d%%",
- 2*i_newvol*100/AOUT_VOLUME_MAX );
+ if( var_GetBool( p_playlist, "loop" ) )
+ { /* FIXME: this is not atomic, we should use a real tristate */
+ var_SetBool( p_playlist, "loop", false );
+ var_SetBool( p_playlist, "repeat", true );
}
- }
- else if( i_action == ACTIONID_VOL_DOWN )
+ else
+ var_SetBool( p_playlist, "loop", true );
+ break;
+
+ case ACTIONID_RANDOM:
{
- audio_volume_t i_newvol;
- aout_VolumeDown( p_intf, 1, &i_newvol );
- if( p_vout->b_fullscreen )
+ var_ToggleBool( p_playlist, "random" );
+ }
+
+ case ACTIONID_PLAY_PAUSE:
+ if( p_input )
{
- vout_OSDSlider( VLC_OBJECT( p_intf ),
- i_newvol*100/AOUT_VOLUME_MAX, 1 );
+ ClearChannels( p_intf, p_vout );
+
+ int state = var_GetInteger( p_input, "state" );
+ if( state != PAUSE_S )
+ {
+ vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
+ OSD_PAUSE_ICON );
+ state = PAUSE_S;
+ }
+ else
+ {
+ vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
+ OSD_PLAY_ICON );
+ state = PLAYING_S;
+ }
+ var_SetInteger( p_input, "state", state );
}
else
- {
- vout_OSDMessage( p_intf, "Vol %d%%",
- 2*i_newvol*100/AOUT_VOLUME_MAX );
- }
+ playlist_Play( p_playlist );
+ break;
- }
- else if( i_action == ACTIONID_SUBDELAY_DOWN )
+ case ACTIONID_AUDIODEVICE_CYCLE:
{
- int i_delay;
- if( input_Control( p_input, INPUT_GET_SUBDELAY, &i_delay ) ==
- VLC_SUCCESS )
+ if( !p_aout )
+ break;
+
+ vlc_value_t val, list, list2;
+ int i_count, i;
+
+ 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;
+
+ if( i_count > 1 )
{
- i_delay--;
- input_Control( p_input, INPUT_SET_SUBDELAY, i_delay );
- vout_OSDMessage( p_intf, "Subtitle delay %i ms", i_delay*100);
+ for( i = 0; i < i_count; i++ )
+ {
+ if( val.i_int == list.p_list->p_values[i].i_int )
+ {
+ 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);
}
+ var_FreeList( &list, &list2 );
+ break;
}
- else if( i_action == ACTIONID_SUBDELAY_UP )
+
+ /* Input options */
+ default:
{
- int i_delay;
- if( input_Control( p_input, INPUT_GET_SUBDELAY, &i_delay ) ==
- VLC_SUCCESS )
+ if( !p_input )
+ break;
+
+ bool b_seekable = var_GetBool( p_input, "can-seek" );
+ int i_interval =0;
+
+ if( i_action == ACTIONID_PAUSE )
{
- i_delay++;
- input_Control( p_input, INPUT_SET_SUBDELAY, i_delay );
- vout_OSDMessage( p_intf, "Subtitle delay %i ms", i_delay*100);
+ if( var_GetInteger( p_input, "state" ) != PAUSE_S )
+ {
+ ClearChannels( p_intf, p_vout );
+ vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
+ OSD_PAUSE_ICON );
+ var_SetInteger( p_input, "state", PAUSE_S );
+ }
}
- }
- else if( i_action == ACTIONID_VOL_MUTE )
- {
- audio_volume_t i_newvol = -1;
- aout_VolumeMute( p_intf, &i_newvol );
- if( i_newvol == 0 )
+ else if( i_action == ACTIONID_JUMP_BACKWARD_EXTRASHORT
+ && b_seekable )
{
- vout_OSDMessage( p_intf, _( "Mute" ) );
+#define SET_TIME( a, b ) \
+ i_interval = config_GetInt( p_input, a "-jump-size" ); \
+ if( i_interval > 0 ) { \
+ mtime_t i_time = (mtime_t)(i_interval * b) * 1000000L; \
+ var_SetTime( p_input, "time-offset", i_time ); \
+ DisplayPosition( p_intf, p_vout, p_input ); \
+ }
+ SET_TIME( "extrashort", -1 );
}
- else
+ else if( i_action == ACTIONID_JUMP_FORWARD_EXTRASHORT && b_seekable )
{
- vout_OSDMessage( p_intf, "Vol %d%%",
- i_newvol * 100 / AOUT_VOLUME_MAX );
+ SET_TIME( "extrashort", 1 );
}
- }
- else if( i_action == ACTIONID_FULLSCREEN && p_vout )
- {
- var_Get( p_vout, "fullscreen", &val );
- var_Set( p_vout, "fullscreen", (vlc_value_t)!val.b_bool );
- }
- else if( i_action == ACTIONID_PLAY )
- {
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
+ else if( i_action == ACTIONID_JUMP_BACKWARD_SHORT && b_seekable )
{
- playlist_Play( p_playlist );
- vlc_object_release( p_playlist );
+ SET_TIME( "short", -1 );
}
- }
- else if( i_action == ACTIONID_PLAY_PAUSE )
- {
- val.i_int = PLAYING_S;
- if( p_input )
+ else if( i_action == ACTIONID_JUMP_FORWARD_SHORT && b_seekable )
{
- var_Get( p_input, "state", &val );
+ SET_TIME( "short", 1 );
}
- if( p_input && val.i_int != PAUSE_S )
+ else if( i_action == ACTIONID_JUMP_BACKWARD_MEDIUM && b_seekable )
{
- vout_OSDMessage( p_intf, _( "Pause" ) );
- val.i_int = PAUSE_S;
- var_Set( p_input, "state", val );
+ SET_TIME( "medium", -1 );
}
- else
+ else if( i_action == ACTIONID_JUMP_FORWARD_MEDIUM && b_seekable )
{
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
- {
- vout_OSDMessage( p_intf, _( "Play" ) );
- playlist_Play( p_playlist );
- vlc_object_release( p_playlist );
- }
+ SET_TIME( "medium", 1 );
}
- }
- else if( p_input )
- {
- vlc_bool_t b_seekable = p_input->stream.b_seekable;
-
- if( i_action == ACTIONID_PAUSE )
+ else if( i_action == ACTIONID_JUMP_BACKWARD_LONG && b_seekable )
{
- vout_OSDMessage( p_intf, _( "Pause" ) );
- val.i_int = PAUSE_S;
- var_Set( p_input, "state", val );
+ SET_TIME( "long", -1 );
}
- else if( i_action == ACTIONID_JUMP_BACKWARD_10SEC && b_seekable )
+ else if( i_action == ACTIONID_JUMP_FORWARD_LONG && b_seekable )
{
- val.i_time = -10000000;
- var_Set( p_input, "time-offset", val );
- if( p_vout->b_fullscreen )
- {
- vout_OSDSlider( VLC_OBJECT( p_intf ),
- GetPosition( p_intf ), 0 );
- }
- else
+ 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 )
{
- vout_OSDMessage( p_intf, _( "Jump -10 seconds" ) );
+ 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 )
+ {
+ msg_Warn( p_input,
+ "invalid current audio track, selecting 0" );
+ i = 0;
+ }
+ else if( i == i_count - 1 )
+ i = 1;
+ else
+ i++;
+ var_Set( p_input, "audio-es", list.p_list->p_values[i] );
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ _("Audio track: %s"),
+ list2.p_list->p_values[i].psz_string );
}
+ var_FreeList( &list, &list2 );
}
- else if( i_action == ACTIONID_JUMP_FORWARD_10SEC && b_seekable )
+ else if( i_action == ACTIONID_SUBTITLE_TRACK )
{
- val.i_time = 10000000;
- var_Set( p_input, "time-offset", val );
- if( p_vout->b_fullscreen )
+ 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_OSDSlider( VLC_OBJECT( p_intf ),
- GetPosition( p_intf ), 0 );
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ _("Subtitle track: %s"), _("N/A") );
+ var_FreeList( &list, &list2 );
+ goto cleanup_and_continue;
}
- else
+ for( i = 0; i < i_count; i++ )
{
- vout_OSDMessage( p_intf, _( "Jump +10 seconds" ) );
+ if( val.i_int == list.p_list->p_values[i].i_int )
+ {
+ break;
+ }
}
- }
- else if( i_action == ACTIONID_JUMP_BACKWARD_1MIN && b_seekable )
- {
- val.i_time = -60000000;
- var_Set( p_input, "time-offset", val );
- if( p_vout->b_fullscreen )
+ /* value of spu-es was not in choices list */
+ if( i == i_count )
{
- vout_OSDSlider( VLC_OBJECT( p_intf ),
- GetPosition( p_intf ), 0 );
+ msg_Warn( p_input,
+ "invalid current subtitle track, selecting 0" );
+ i = 0;
}
+ else if( i == i_count - 1 )
+ i = 0;
else
- {
- vout_OSDMessage( p_intf, _( "Jump -1 minute" ) );
- }
+ i++;
+ var_Set( p_input, "spu-es", list.p_list->p_values[i] );
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ _("Subtitle track: %s"),
+ list2.p_list->p_values[i].psz_string );
+ var_FreeList( &list, &list2 );
}
- else if( i_action == ACTIONID_JUMP_FORWARD_1MIN && b_seekable )
+ else if( i_action == ACTIONID_ASPECT_RATIO && p_vout )
{
- val.i_time = 60000000;
- var_Set( p_input, "time-offset", val );
- if( p_vout->b_fullscreen )
+ 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 )
{
- vout_OSDSlider( VLC_OBJECT( p_intf ),
- GetPosition( p_intf ), 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, "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_FreeList( &val_list, &text_list );
}
- else
+ free( val.psz_string );
+ }
+ 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 )
{
- vout_OSDMessage( p_intf, _( "Jump +1 minute" ) );
+ 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_FreeList( &val_list, &text_list );
}
+ free( val.psz_string );
}
- else if( i_action == ACTIONID_JUMP_BACKWARD_5MIN && b_seekable )
+ else if( i_action == ACTIONID_TOGGLE_AUTOSCALE && p_vout )
{
- vout_OSDMessage( p_intf, _( "Jump -5 minutes" ) );
- val.i_time = -300000000;
- var_Set( p_input, "time-offset", val );
- if( p_vout->b_fullscreen )
+ float f_scalefactor = var_GetFloat( p_vout, "scale" );
+ if ( f_scalefactor != 1.0 )
{
- vout_OSDSlider( VLC_OBJECT( p_intf ),
- GetPosition( p_intf ), 0 );
+ var_SetFloat( p_vout, "scale", 1.0 );
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ "%s", _("Zooming reset") );
}
else
{
- vout_OSDMessage( p_intf, _( "Jump -5 minutes" ) );
+ bool b_autoscale = !var_GetBool( p_vout, "autoscale" );
+ var_SetBool( p_vout, "autoscale", b_autoscale );
+ if( b_autoscale )
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ "%s", _("Scaled to screen") );
+ else
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ "%s", _("Original Size") );
}
}
- else if( i_action == ACTIONID_JUMP_FORWARD_5MIN && b_seekable )
+ else if( i_action == ACTIONID_SCALE_UP && p_vout )
+ {
+ float f_scalefactor;
+
+ f_scalefactor = var_GetFloat( p_vout, "scale" );
+ if( f_scalefactor < 10. )
+ f_scalefactor += .1;
+ var_SetFloat( p_vout, "scale", f_scalefactor );
+ }
+ else if( i_action == ACTIONID_SCALE_DOWN && p_vout )
+ {
+ float f_scalefactor;
+
+ f_scalefactor = var_GetFloat( p_vout, "scale" );
+ if( f_scalefactor > .3 )
+ f_scalefactor -= .1;
+ var_SetFloat( p_vout, "scale", f_scalefactor );
+ }
+ else if( i_action == ACTIONID_DEINTERLACE && p_vout )
{
- val.i_time = 300000000;
- var_Set( p_input, "time-offset", val );
- if( p_vout->b_fullscreen )
+ vlc_value_t val={0}, val_list, text_list;
+ var_Get( p_vout, "deinterlace-mode", &val );
+ if( var_Change( p_vout, "deinterlace-mode", VLC_VAR_GETLIST,
+ &val_list, &text_list ) >= 0 )
{
- vout_OSDSlider( VLC_OBJECT( p_intf ),
- GetPosition( p_intf ), 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, "deinterlace-mode",
+ 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_FreeList( &val_list, &text_list );
}
- else
+ 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 )
{
- vout_OSDMessage( p_intf, _( "Jump +5 minutes" ) );
+ 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_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 )
{
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
- {
- playlist_Next( p_playlist );
- vlc_object_release( p_playlist );
- }
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, "%s", _("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 )
- {
- playlist_Prev( p_playlist );
- vlc_object_release( p_playlist );
- }
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, "%s",
+ _("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_FRAME_NEXT )
+ {
+ var_TriggerCallback( p_input, "frame-next" );
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ "%s", _("Next frame") );
}
else if( i_action == ACTIONID_FASTER )
{
- vlc_value_t val; val.b_bool = VLC_TRUE;
- var_Set( p_input, "rate-faster", val );
+ var_TriggerCallback( p_input, "rate-faster" );
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ "%s", _("Faster") );
}
else if( i_action == ACTIONID_SLOWER )
{
- vlc_value_t val; val.b_bool = VLC_TRUE;
- var_Set( p_input, "rate-slower", val );
+ var_TriggerCallback( p_input, "rate-slower" );
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ "%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,
+ "%s", _("1.00x") );
}
- else if( i_action == ACTIONID_POSITION )
+ else if( i_action == ACTIONID_RATE_FASTER_FINE ||
+ i_action == ACTIONID_RATE_SLOWER_FINE )
{
- char psz_duration[MSTRTIME_MAX_SIZE];
- char psz_time[MSTRTIME_MAX_SIZE];
- vlc_value_t time;
- mtime_t i_seconds;
+ /* The playback rate is defined by INPUT_RATE_DEFAULT / "rate"
+ * and we want to increase/decrease it by 0.1 while making sure
+ * that the resulting playback rate is a multiple of 0.1
+ */
+ int i_rate = var_GetInteger( p_input, "rate" );
+ if( i_rate == 0 )
+ i_rate = INPUT_RATE_MIN;
+ int i_sign = i_rate < 0 ? -1 : 1;
+ const int i_dir = i_action == ACTIONID_RATE_FASTER_FINE ? 1 : -1;
- var_Get( p_input, "time", &time );
- i_seconds = time.i_time / 1000000;
- secstotimestr ( psz_time, i_seconds );
+ const double f_speed = floor( ( (double)INPUT_RATE_DEFAULT / abs(i_rate) + 0.05 ) / 0.1 + i_dir ) * 0.1;
+ if( f_speed <= (double)INPUT_RATE_DEFAULT / INPUT_RATE_MAX ) /* Needed to avoid infinity */
+ i_rate = INPUT_RATE_MAX;
+ else
+ i_rate = INPUT_RATE_DEFAULT / f_speed + 0.5;
- var_Get( p_input, "length", &time );
- if( time.i_time > 0 )
- {
- secstotimestr( psz_duration, time.i_time / 1000000 );
- vout_OSDMessage( p_input, "%s / %s",
- psz_time, psz_duration );
- }
- else if( i_seconds > 0 )
- {
- vout_OSDMessage( p_input, psz_time );
- }
+ i_rate = i_sign * __MIN( __MAX( i_rate, INPUT_RATE_MIN ), INPUT_RATE_MAX );
+
+ var_SetInteger( p_input, "rate", i_rate );
+
+ 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, "%s", psz_msg );
+ }
+ else if( i_action == ACTIONID_POSITION && b_seekable )
+ {
+ DisplayPosition( p_intf, p_vout, p_input );
}
else if( i_action >= ACTIONID_PLAY_BOOKMARK1 &&
i_action <= ACTIONID_PLAY_BOOKMARK10 )
{
SetBookmark( p_intf, i_action - ACTIONID_SET_BOOKMARK1 + 1 );
}
- }
- }
-}
+ /* Only makes sense with DVD */
+ else if( i_action == ACTIONID_TITLE_PREV )
+ var_TriggerCallback( p_input, "prev-title" );
+ else if( i_action == ACTIONID_TITLE_NEXT )
+ var_TriggerCallback( p_input, "next-title" );
+ else if( i_action == ACTIONID_CHAPTER_PREV )
+ var_TriggerCallback( p_input, "prev-chapter" );
+ else if( i_action == ACTIONID_CHAPTER_NEXT )
+ var_TriggerCallback( p_input, "next-chapter" );
+ else if( i_action == ACTIONID_DISC_MENU )
+ var_SetInteger( p_input, "title 0", 2 );
-static int GetKey( intf_thread_t *p_intf)
-{
- vlc_mutex_lock( &p_intf->p_sys->change_lock );
- if ( p_intf->p_sys->i_size == 0 )
- {
- vlc_mutex_unlock( &p_intf->p_sys->change_lock );
- return -1;
- }
- 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 ];
+ 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 )
+ {
+ if( var_GetInteger( p_input, "rate" ) != 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) );
+ }
+ else if( i_action == ACTIONID_RECORD )
+ {
+ if( var_GetBool( p_input, "can-record" ) )
+ {
+ const bool b_record = !var_GetBool( p_input, "record" );
+
+ if( b_record )
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _("Recording") );
+ else
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _("Recording done") );
+ var_SetBool( p_input, "record", b_record );
+ }
+ }
}
- vlc_mutex_unlock( &p_intf->p_sys->change_lock );
- return i_return;
}
+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;
}
/*****************************************************************************
- * 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 = 0;
+
+ (void)psz_var;
+ (void)oldval;
+
+ int i_mode = p_intf->p_sys->i_mousewheel_mode;
+
+ /* Special action for mouse event */
+ /* FIXME: rework hotkeys handling to allow more than 1 event
+ * to trigger one same action */
+ switch (newval.i_int & ~KEY_MODIFIER)
{
- 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 = (i_mode == MOUSEWHEEL_VOLUME ) ? ACTIONID_VOL_UP
+ : ACTIONID_JUMP_FORWARD_EXTRASHORT;
+ break;
+ case KEY_MOUSEWHEELDOWN:
+ i_action = (i_mode == MOUSEWHEEL_VOLUME ) ? ACTIONID_VOL_DOWN
+ : ACTIONID_JUMP_BACKWARD_EXTRASHORT;
+ break;
+ case KEY_MOUSEWHEELLEFT:
+ i_action = (i_mode == MOUSEWHEEL_VOLUME ) ?
+ ACTIONID_JUMP_BACKWARD_EXTRASHORT : ACTIONID_VOL_DOWN;
+ break;
+ case KEY_MOUSEWHEELRIGHT:
+ i_action = (i_mode == MOUSEWHEEL_VOLUME ) ?
+ ACTIONID_JUMP_FORWARD_EXTRASHORT : ACTIONID_VOL_UP;
+ break;
+ case KEY_MENU:
+ var_SetBool( libvlc, "intf-popupmenu", true );
+ break;
}
- vlc_mutex_unlock( &p_intf->p_sys->change_lock );
+ if( i_mode == NO_MOUSEWHEEL ) return VLC_SUCCESS;
+
+ if( i_action )
+ return PutAction( p_intf, i_action );
return VLC_SUCCESS;
}
-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 );
+ char *psz_bookmark_name;
+ if( asprintf( &psz_bookmark_name, "bookmark%i", i_num ) == -1 )
+ return;
- 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 );
+ playlist_t *p_playlist = pl_Hold( p_intf );
+ char *psz_bookmark = var_CreateGetString( p_intf, psz_bookmark_name );
- if( p_playlist )
- {
- char *psz_bookmark = strdup( val.psz_string );
- for( i_position = 0; i_position < p_playlist->i_size; i_position++)
+ 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;
+
+ free( psz_bookmark );
+ free( psz_bookmark_name );
+ pl_Release( p_intf );
}
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 )
+ char *psz_bookmark_name;
+ if( asprintf( &psz_bookmark_name, "bookmark%i", i_num ) == -1 )
+ return;
+
+ playlist_t *p_playlist = pl_Hold( p_intf );
+ var_Create( p_intf, psz_bookmark_name,
+ VLC_VAR_STRING|VLC_VAR_DOINHERIT );
+ playlist_item_t * p_item = playlist_CurrentPlayingItem( p_playlist );
+ if( 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_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 );
+ free( psz_bookmark_name );
}
-static int GetPosition( intf_thread_t *p_intf )
+static void DisplayPosition( intf_thread_t *p_intf, vout_thread_t *p_vout,
+ input_thread_t *p_input )
{
- input_thread_t *p_input =
- (input_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
- if( p_input )
+ char psz_duration[MSTRTIME_MAX_SIZE];
+ char psz_time[MSTRTIME_MAX_SIZE];
+ vlc_value_t time, pos;
+ mtime_t i_seconds;
+
+ if( p_vout == NULL ) return;
+
+ ClearChannels( p_intf, p_vout );
+
+ var_Get( p_input, "time", &time );
+ i_seconds = time.i_time / 1000000;
+ secstotimestr ( psz_time, i_seconds );
+
+ var_Get( p_input, "length", &time );
+ if( time.i_time > 0 )
+ {
+ secstotimestr( psz_duration, time.i_time / 1000000 );
+ vout_OSDMessage( p_input, POSITION_TEXT_CHAN, "%s / %s",
+ psz_time, psz_duration );
+ }
+ else if( i_seconds > 0 )
+ {
+ vout_OSDMessage( p_input, POSITION_TEXT_CHAN, "%s", psz_time );
+ }
+
+ if( var_GetBool( p_vout, "fullscreen" ) )
{
- vlc_value_t pos;
var_Get( p_input, "position", &pos );
- vlc_object_release( p_input );
- return pos.f_float * 100;
+ vout_OSDSlider( VLC_OBJECT( p_input ), POSITION_WIDGET_CHAN,
+ pos.f_float * 100, OSD_HOR_SLIDER );
+ }
+}
+
+static void DisplayVolume( intf_thread_t *p_intf, vout_thread_t *p_vout,
+ audio_volume_t i_vol )
+{
+ if( p_vout == NULL )
+ {
+ return;
+ }
+ ClearChannels( p_intf, p_vout );
+
+ if( var_GetBool( p_vout, "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, _( "Volume %d%%" ),
+ i_vol*400/AOUT_VOLUME_MAX );
+ }
+}
+
+static void ClearChannels( intf_thread_t *p_intf, vout_thread_t *p_vout )
+{
+ int i;
+
+ if( p_vout )
+ {
+ 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_spu, SPU_CHANNEL_CLEAR,
+ p_intf->p_sys->p_channels[ i ] );
+ }
}
- return -1;
}
projects / vlc / blobdiff