/*****************************************************************************
* 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.
*****************************************************************************/
/*****************************************************************************
#include <vlc/input.h>
#include <vlc/vout.h>
#include <vlc/aout.h>
-#include <osd.h>
+#include <vlc_osd.h>
#include "vlc_keys.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 ]
+#define POSITION_TEXT_CHAN p_intf->p_sys->p_channels[ 2 ]
+#define POSITION_WIDGET_CHAN p_intf->p_sys->p_channels[ 3 ]
/*****************************************************************************
* intf_sys_t: description and status of FB interface
*****************************************************************************/
int p_keys[ BUFFER_SIZE ]; /* buffer that contains
* keyevents */
int i_size; /* number of events in buffer */
+ 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_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.")
+#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_shortname( _("Hotkeys") );
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();
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 );
+ var_AddCallback( p_intf->p_libvlc, "key-pressed", KeyEvent, p_intf );
return 0;
}
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
+ var_DelCallback( p_intf->p_libvlc, "key-pressed", KeyEvent, p_intf );
if( p_intf->p_sys->p_input )
{
vlc_object_release( p_intf->p_sys->p_input );
*****************************************************************************/
static void Run( intf_thread_t *p_intf )
{
- playlist_t *p_playlist;
- input_thread_t *p_input;
+ playlist_t *p_playlist = NULL;
+ input_thread_t *p_input = NULL;
vout_thread_t *p_vout = NULL;
- struct hotkey *p_hotkeys = p_intf->p_vlc->p_hotkeys;
+ vout_thread_t *p_last_vout = NULL;
+ struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
vlc_value_t val;
int i;
/* Initialize hotkey structure */
for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
{
- var_Create( p_intf->p_vlc, p_hotkeys[i].psz_action,
+ var_Create( p_intf->p_libvlc, p_hotkeys[i].psz_action,
VLC_VAR_HOTKEY | VLC_VAR_DOINHERIT );
- var_AddCallback( p_intf->p_vlc, p_hotkeys[i].psz_action,
+ var_AddCallback( p_intf->p_libvlc, 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 );
+ var_Get( p_intf->p_libvlc, p_hotkeys[i].psz_action, &val );
+ var_Set( p_intf->p_libvlc, p_hotkeys[i].psz_action, val );
}
while( !p_intf->b_die )
{
int i_key, i_action;
+ int i_times = 0;
/* Sleep a bit */
msleep( INTF_IDLE_SLEEP );
/* 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 );
+ p_playlist = (playlist_t *)vlc_object_find( p_intf,
+ VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ if( p_playlist )
+ {
+ p_intf->p_sys->p_input = p_playlist->p_input;
+ if( p_intf->p_sys->p_input )
+ vlc_object_yield( p_intf->p_sys->p_input );
+ vlc_object_release( p_playlist );
+ }
}
else if( p_intf->p_sys->p_input->b_dead )
{
p_input = p_intf->p_sys->p_input;
/* 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 = NULL;
}
+ /* Register OSD channels */
+ if( p_vout && p_vout != p_last_vout )
+ {
+ for( i = 0; i < CHANNELS_NUMBER; i++ )
+ {
+ spu_Control( p_vout->p_spu, SPU_CHANNEL_REGISTER,
+ &p_intf->p_sys->p_channels[ i ] );
+ }
+ }
+
/* Find action triggered by hotkey */
i_action = 0;
i_key = GetKey( p_intf );
- for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
+ for( i = 0; i_key != -1 && p_hotkeys[i].psz_action != NULL; i++ )
{
if( p_hotkeys[i].i_key == i_key )
{
- i_action = p_hotkeys[i].i_action;
+ i_action = p_hotkeys[i].i_action;
+ i_times = p_hotkeys[i].i_times;
+ /* times key pressed within max. delta time */
+ p_hotkeys[i].i_times = 0;
}
}
if( i_action == ACTIONID_QUIT )
{
- p_intf->p_vlc->b_die = VLC_TRUE;
- vout_OSDMessage( p_intf, _( "Quit" ) );
+ 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 is stopped now kill vlc. */
+ p_intf->p_libvlc->b_die = VLC_TRUE;
+ ClearChannels( p_intf, p_vout );
+ vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Quit" ) );
continue;
}
else if( i_action == ACTIONID_VOL_UP )
{
audio_volume_t i_newvol;
aout_VolumeUp( p_intf, 1, &i_newvol );
- if( p_vout )
- {
- if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
- {
- vout_OSDSlider( VLC_OBJECT( p_intf ),
- i_newvol*100/AOUT_VOLUME_MAX, 1 );
- }
- else
- {
- vout_OSDMessage( p_intf, "Vol %d%%",
- 2*i_newvol*100/AOUT_VOLUME_MAX );
- }
- }
+ DisplayVolume( p_intf, p_vout, i_newvol );
}
else if( i_action == ACTIONID_VOL_DOWN )
{
audio_volume_t i_newvol;
aout_VolumeDown( p_intf, 1, &i_newvol );
+ DisplayVolume( p_intf, p_vout, i_newvol );
+ }
+ else if( i_action == ACTIONID_VOL_MUTE )
+ {
+ audio_volume_t i_newvol = -1;
+ aout_VolumeMute( p_intf, &i_newvol );
if( p_vout )
{
- if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
+ if( i_newvol == 0 )
{
- vout_OSDSlider( VLC_OBJECT( p_intf ),
- i_newvol*100/AOUT_VOLUME_MAX, 1 );
+ ClearChannels( p_intf, p_vout );
+ vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
+ OSD_MUTE_ICON );
}
else
{
- vout_OSDMessage( p_intf, "Vol %d%%",
- 2*i_newvol*100/AOUT_VOLUME_MAX );
+ DisplayVolume( p_intf, p_vout, i_newvol );
}
}
-
}
- else if( i_action == ACTIONID_SUBDELAY_DOWN )
+ else if( i_action == ACTIONID_INTF_SHOW )
{
- int i_delay;
- if( input_Control( p_input, INPUT_GET_SUBDELAY, &i_delay ) ==
- VLC_SUCCESS )
+ val.b_bool = VLC_TRUE;
+ p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist )
{
- i_delay--;
- input_Control( p_input, INPUT_SET_SUBDELAY, i_delay );
- vout_OSDMessage( p_intf, "Subtitle delay %i ms", i_delay*100);
+ var_Set( p_playlist, "intf-show", val );
+ vlc_object_release( p_playlist );
}
}
- else if( i_action == ACTIONID_SUBDELAY_UP )
+ else if( i_action == ACTIONID_INTF_HIDE )
{
- int i_delay;
- if( input_Control( p_input, INPUT_GET_SUBDELAY, &i_delay ) ==
- VLC_SUCCESS )
+ val.b_bool = VLC_FALSE;
+ p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist )
{
- i_delay++;
- input_Control( p_input, INPUT_SET_SUBDELAY, i_delay );
- vout_OSDMessage( p_intf, "Subtitle delay %i ms", i_delay*100);
+ var_Set( p_playlist, "intf-show", val );
+ vlc_object_release( p_playlist );
}
}
- else if( i_action == ACTIONID_VOL_MUTE )
+ else if( i_action == ACTIONID_SNAPSHOT )
{
- audio_volume_t i_newvol = -1;
- aout_VolumeMute( p_intf, &i_newvol );
- if( i_newvol == 0 )
+ if( p_vout ) vout_Control( p_vout, VOUT_SNAPSHOT );
+ }
+ else if( i_action == ACTIONID_FULLSCREEN )
+ {
+ if( p_vout )
{
- vout_OSDMessage( p_intf, _( "Mute" ) );
+ var_Get( p_vout, "fullscreen", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_vout, "fullscreen", val );
}
else
{
- vout_OSDMessage( p_intf, "Vol %d%%",
- i_newvol * 100 / AOUT_VOLUME_MAX );
- }
- }
- 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,
+ p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
- if( p_playlist )
- {
- playlist_Play( p_playlist );
- vlc_object_release( p_playlist );
+ if( p_playlist )
+ {
+ var_Get( p_playlist, "fullscreen", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "fullscreen", val );
+ vlc_object_release( p_playlist );
+ }
}
}
else if( i_action == ACTIONID_PLAY_PAUSE )
val.i_int = PLAYING_S;
if( p_input )
{
+ ClearChannels( p_intf, p_vout );
+
var_Get( p_input, "state", &val );
- }
- if( p_input && val.i_int != PAUSE_S )
- {
- vout_OSDMessage( p_intf, _( "Pause" ) );
- val.i_int = PAUSE_S;
+ 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
FIND_ANYWHERE );
if( p_playlist )
{
- vout_OSDMessage( p_intf, _( "Play" ) );
playlist_Play( p_playlist );
vlc_object_release( p_playlist );
}
}
else if( p_input )
{
- vlc_bool_t b_seekable = p_input->stream.b_seekable;
+ /* FIXME --fenrir
+ * How to get a valid value ?
+ * That's not that easy with some special stream
+ */
+ vlc_bool_t b_seekable = VLC_TRUE;
+ int i_interval =0;
if( i_action == ACTIONID_PAUSE )
{
- vout_OSDMessage( p_intf, _( "Pause" ) );
- 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_EXTRASHORT
+ && b_seekable )
+ {
+#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 \
+ * ((mtime_t)(1 << i_times))); \
+ 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_EXTRASHORT && b_seekable )
+ {
+ SET_TIME( "extrashort", 1 );
+ }
+ else if( i_action == ACTIONID_JUMP_BACKWARD_SHORT && b_seekable )
+ {
+ SET_TIME( "short", -1 );
+ }
+ else if( i_action == ACTIONID_JUMP_FORWARD_SHORT && b_seekable )
+ {
+ SET_TIME( "short", 1 );
+ }
+ else if( i_action == ACTIONID_JUMP_BACKWARD_MEDIUM && b_seekable )
+ {
+ SET_TIME( "medium", -1 );
}
- else if( i_action == ACTIONID_JUMP_BACKWARD_10SEC && b_seekable )
+ else if( i_action == ACTIONID_JUMP_FORWARD_MEDIUM && b_seekable )
{
- val.i_time = -10000000;
- var_Set( p_input, "time-offset", val );
- if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
+ SET_TIME( "medium", 1 );
+ }
+ else if( i_action == ACTIONID_JUMP_BACKWARD_LONG && b_seekable )
+ {
+ 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 )
+ {
+ 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 )
{
- vout_OSDSlider( VLC_OBJECT( p_intf ),
- GetPosition( p_intf ), 0 );
+ var_Set( p_input, "audio-es",
+ list.p_list->p_values[1] );
+ i = 1;
}
else
{
- vout_OSDMessage( p_intf, _( "Jump -10 seconds" ) );
+ 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_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 )
+ 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 )
{
- if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
- {
- vout_OSDSlider( VLC_OBJECT( p_intf ),
- GetPosition( p_intf ), 0 );
- }
- else
+ 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 )
{
- vout_OSDMessage( p_intf, _( "Jump +10 seconds" ) );
+ 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_JUMP_BACKWARD_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 )
+ 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 )
{
- if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
+ int i;
+ for( i = 0; i < val_list.p_list->i_count; i++ )
{
- vout_OSDSlider( VLC_OBJECT( p_intf ),
- GetPosition( p_intf ), 0 );
- }
- else
- {
- vout_OSDMessage( p_intf, _( "Jump -1 minute" ) );
+ 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 );
}
+ free( val.psz_string );
}
- else if( i_action == ACTIONID_JUMP_FORWARD_1MIN && b_seekable )
+ else if( i_action == ACTIONID_CROP && p_vout )
{
- val.i_time = 60000000;
- var_Set( p_input, "time-offset", val );
- if( 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 )
{
- if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
+ int i;
+ for( i = 0; i < val_list.p_list->i_count; i++ )
{
- vout_OSDSlider( VLC_OBJECT( p_intf ),
- GetPosition( p_intf ), 0 );
- }
- else
- {
- vout_OSDMessage( p_intf, _( "Jump +1 minute" ) );
+ 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 );
}
+ free( val.psz_string );
}
- else if( i_action == ACTIONID_JUMP_BACKWARD_5MIN && b_seekable )
+ else if( i_action == ACTIONID_DEINTERLACE && p_vout )
{
- vout_OSDMessage( p_intf, _( "Jump -5 minutes" ) );
- val.i_time = -300000000;
- var_Set( p_input, "time-offset", val );
- if( 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,
+ &val_list, &text_list ) >= 0 )
{
- if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
- {
- vout_OSDSlider( VLC_OBJECT( p_intf ),
- GetPosition( p_intf ), 0 );
- }
- else
+ int i;
+ for( i = 0; i < val_list.p_list->i_count; i++ )
{
- vout_OSDMessage( p_intf, _( "Jump -5 minutes" ) );
+ 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 );
}
+ free( val.psz_string );
}
- else if( i_action == ACTIONID_JUMP_FORWARD_5MIN && b_seekable )
+ else if( ( i_action == ACTIONID_ZOOM || i_action == ACTIONID_UNZOOM ) && p_vout )
{
- val.i_time = 300000000;
- var_Set( p_input, "time-offset", val );
- if( 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 )
{
- if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
+ int i;
+ for( i = 0; i < val_list.p_list->i_count; i++ )
{
- vout_OSDSlider( VLC_OBJECT( p_intf ),
- GetPosition( p_intf ), 0 );
- }
- else
- {
- vout_OSDMessage( p_intf, _( "Jump +5 minutes" ) );
+ 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 );
}
}
+ else if( i_action == ACTIONID_CROP_TOP && p_vout )
+ {
+ int i_val = var_GetInteger( p_vout, "crop-top" );
+ var_SetInteger( p_vout, "crop-top", i_val+1 );
+ }
+ else if( i_action == ACTIONID_UNCROP_TOP && p_vout )
+ {
+ int i_val = var_GetInteger( p_vout, "crop-top" );
+ if( i_val != 0 )
+ var_SetInteger( p_vout, "crop-top", i_val-1 );
+ }
+ else if( i_action == ACTIONID_CROP_BOTTOM && p_vout )
+ {
+ int i_val = var_GetInteger( p_vout, "crop-bottom" );
+ var_SetInteger( p_vout, "crop-bottom", i_val+1 );
+ }
+ else if( i_action == ACTIONID_UNCROP_BOTTOM && p_vout )
+ {
+ int i_val = var_GetInteger( p_vout, "crop-bottom" );
+ if( i_val != 0 )
+ var_SetInteger( p_vout, "crop-bottom", i_val-1 );
+ }
+ else if( i_action == ACTIONID_CROP_LEFT && p_vout )
+ {
+ int i_val = var_GetInteger( p_vout, "crop-left" );
+ var_SetInteger( p_vout, "crop-left", i_val+1 );
+ }
+ else if( i_action == ACTIONID_UNCROP_LEFT && p_vout )
+ {
+ int i_val = var_GetInteger( p_vout, "crop-left" );
+ if( i_val != 0 )
+ var_SetInteger( p_vout, "crop-left", i_val-1 );
+ }
+ else if( i_action == ACTIONID_CROP_RIGHT && p_vout )
+ {
+ int i_val = var_GetInteger( p_vout, "crop-right" );
+ var_SetInteger( p_vout, "crop-right", i_val+1 );
+ }
+ else if( i_action == ACTIONID_UNCROP_RIGHT && p_vout )
+ {
+ int i_val = var_GetInteger( p_vout, "crop-right" );
+ if( i_val != 0 )
+ var_SetInteger( p_vout, "crop-right", i_val-1 );
+ }
else if( i_action == ACTIONID_NEXT )
{
p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist )
{
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ _("Next") );
playlist_Next( p_playlist );
vlc_object_release( p_playlist );
}
FIND_ANYWHERE );
if( p_playlist )
{
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ _("Previous") );
playlist_Prev( p_playlist );
vlc_object_release( p_playlist );
}
}
else if( i_action == ACTIONID_FASTER )
{
- vlc_value_t val; val.b_bool = VLC_TRUE;
+ vlc_value_t val;
+ val.b_bool = VLC_TRUE;
var_Set( p_input, "rate-faster", val );
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ _("Faster") );
}
else if( i_action == ACTIONID_SLOWER )
{
- vlc_value_t val; val.b_bool = VLC_TRUE;
+ vlc_value_t val;
+ val.b_bool = VLC_TRUE;
var_Set( p_input, "rate-slower", val );
+ vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
+ _("Slower") );
}
- else if( i_action == ACTIONID_POSITION )
+ else if( i_action == ACTIONID_POSITION && b_seekable )
{
- char psz_duration[MSTRTIME_MAX_SIZE];
- char psz_time[MSTRTIME_MAX_SIZE];
- vlc_value_t time;
- mtime_t i_seconds;
-
- 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, "%s / %s",
- psz_time, psz_duration );
- }
- else if( i_seconds > 0 )
- {
- vout_OSDMessage( p_input, psz_time );
- }
+ 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 )
+ {
+ val.b_bool = VLC_TRUE;
+ var_Set( p_input, "prev-title", val );
+ }
+ else if( i_action == ACTIONID_TITLE_NEXT )
+ {
+ val.b_bool = VLC_TRUE;
+ var_Set( p_input, "next-title", val );
+ }
+ else if( i_action == ACTIONID_CHAPTER_PREV )
+ {
+ val.b_bool = VLC_TRUE;
+ var_Set( p_input, "prev-chapter", val );
+ }
+ else if( i_action == ACTIONID_CHAPTER_NEXT )
+ {
+ val.b_bool = VLC_TRUE;
+ var_Set( p_input, "next-chapter", val );
+ }
+ else if( i_action == ACTIONID_DISC_MENU )
+ {
+ vlc_value_t val; val.i_int = 2;
+ var_Set( p_input, "title 0", val);
+ }
+ 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 )
+ {
+ p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist )
+ {
+ var_Get( p_input, "rate", &val );
+ msg_Dbg( p_input, "rate %d", val.i_int );
+ if( val.i_int != INPUT_RATE_DEFAULT )
+ {
+ /* Return to normal speed */
+ val.i_int = INPUT_RATE_DEFAULT;
+ var_Set( p_input, "rate", val );
+ }
+ else
+ {
+ ClearChannels( p_intf, p_vout );
+ vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
+ OSD_PLAY_ICON );
+ playlist_Play( p_playlist );
+ }
+ vlc_object_release( p_playlist );
+ }
+ }
}
}
}
static int ActionKeyCB( vlc_object_t *p_this, 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;
+ libvlc_int_t *p_libvlc = (libvlc_int_t *)p_this;
+ struct hotkey *p_hotkeys = p_libvlc->p_hotkeys;
+ mtime_t i_date;
int i;
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;
+ /* do hotkey accounting */
+ i_date = mdate();
+ if( (p_hotkeys[i].i_delta_date > 0) &&
+ (p_hotkeys[i].i_delta_date <= (i_date - p_hotkeys[i].i_last_date) ) )
+ p_hotkeys[i].i_times = 0;
+ else
+ p_hotkeys[i].i_times++;
+ p_hotkeys[i].i_last_date = i_date;
}
}
static void PlayBookmark( intf_thread_t *p_intf, int i_num )
{
vlc_value_t val;
- int i_position;
+ int i;
char psz_bookmark_name[11];
playlist_t *p_playlist =
vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_playlist )
{
char *psz_bookmark = strdup( val.psz_string );
- for( i_position = 0; i_position < p_playlist->i_size; i_position++)
+ for( i = 0; i < p_playlist->i_size; i++)
{
if( !strcmp( psz_bookmark,
- p_playlist->pp_items[i_position]->input.psz_uri ) )
+ p_playlist->pp_items[i]->p_input->psz_uri ) )
{
- playlist_Goto( p_playlist, i_position );
+ playlist_LockControl( p_playlist, PLAYLIST_VIEWPLAY, NULL,
+ p_playlist->pp_items[i] );
break;
}
}
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 )
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 );
+ if( p_playlist->status.p_item )
+ {
+ config_PutPsz( p_intf, psz_bookmark_name,
+ p_playlist->status.p_item->p_input->psz_uri);
+ msg_Info( p_intf, "setting playlist bookmark %i to %s", i_num,
+ p_playlist->status.p_item->p_input->psz_uri);
+ config_SaveConfigFile( p_intf, "hotkeys" );
+ }
vlc_object_release( p_playlist );
}
}
-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, psz_time );
+ }
+
+ if( !p_vout->p_parent_intf || p_vout->b_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( !p_vout->p_parent_intf || 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, "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_Control( p_vout->p_spu, SPU_CHANNEL_CLEAR, DEFAULT_CHAN );
+ for( i = 0; i < CHANNELS_NUMBER; i++ )
+ {
+ spu_Control( p_vout->p_spu, SPU_CHANNEL_CLEAR,
+ p_intf->p_sys->p_channels[ i ] );
+ }
}
- return -1;
}
projects / vlc / blobdiff