/*****************************************************************************
* hotkeys.c: Hotkey handling for vlc
*****************************************************************************
- * Copyright (C) 2003 VideoLAN
- * $Id: hotkeys.c,v 1.1 2003/10/26 12:46:55 sigmunau Exp $
+ * Copyright (C) 2004 VideoLAN
+ * $Id: hotkeys.c,v 1.16 2004/01/25 16:17:03 anil Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
* Preamble
*****************************************************************************/
#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
#include <vlc/vlc.h>
#include <vlc/intf.h>
+#include <vlc/input.h>
#include <vlc/vout.h>
#include <vlc/aout.h>
#include <osd.h>
+#include "vlc_keys.h"
+
#define BUFFER_SIZE 10
/*****************************************************************************
* intf_sys_t: description and status of FB interface
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
static void Run ( intf_thread_t * );
-static void Feedback( intf_thread_t *, char * );
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 *,
+ vlc_value_t, vlc_value_t, void * );
+static void PlayBookmark( intf_thread_t *, int );
+static void SetBookmark ( intf_thread_t *, int );
/*****************************************************************************
* 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( _("hotkey interface") );
+ 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 );
return 0;
}
playlist_t *p_playlist;
input_thread_t *p_input;
vout_thread_t *p_vout = NULL;
- int i_fullscreen = config_GetInt( p_intf, "fullscreen-key" );
- int i_quit = config_GetInt( p_intf, "quit-key" );
- int i_vol_up = config_GetInt( p_intf, "vol-up-key" );
- int i_vol_down = config_GetInt( p_intf, "vol-down-key" );
- int i_play_pause = config_GetInt( p_intf, "play-pause-key" );
- int i_play = config_GetInt( p_intf, "play-key" );
- int i_pause = config_GetInt( p_intf, "pause-key" );
- int i_stop = config_GetInt( p_intf, "stop-key" );
- int i_next = config_GetInt( p_intf, "next-key" );
- int i_prev = config_GetInt( p_intf, "prev-key" );
- int i_faster = config_GetInt( p_intf, "faster-key" );
- int i_slower = config_GetInt( p_intf, "slower-key" );
- int i_key = 0;
-
+ struct hotkey *p_hotkeys = p_intf->p_vlc->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,
+ 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 );
+ }
+
while( !p_intf->b_die )
{
+ int i_key, i_action;
+
/* Sleep a bit */
msleep( INTF_IDLE_SLEEP );
p_intf->p_sys->p_vout = NULL;
}
+ /* Find action triggered by hotkey */
+ i_action = 0;
i_key = GetKey( p_intf );
- if ( !i_key )
+ 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;
+ }
+ }
+
+ if( !i_action )
{
/* No key pressed, sleep a bit more */
msleep( INTF_IDLE_SLEEP );
continue;
}
- if( i_key == i_quit )
+
+ if( i_action == ACTIONID_QUIT )
{
p_intf->p_vlc->b_die = VLC_TRUE;
- Feedback( p_intf, _("Quit" ) );
+ vout_OSDMessage( VLC_OBJECT(p_intf), _( "Quit" ) );
continue;
}
- if( i_key == i_vol_up )
+ else if( i_action == ACTIONID_VOL_UP )
{
audio_volume_t i_newvol;
char string[9];
aout_VolumeUp( p_intf, 1, &i_newvol );
- sprintf( string, "Vol %%%d", i_newvol*100/AOUT_VOLUME_MAX );
- Feedback( p_intf, string );
+ sprintf( string, "Vol %d%%", i_newvol*100/AOUT_VOLUME_MAX );
+ vout_OSDMessage( VLC_OBJECT(p_intf), string );
}
- if( i_key == i_vol_down )
+ else if( i_action == ACTIONID_VOL_DOWN )
{
audio_volume_t i_newvol;
char string[9];
aout_VolumeDown( p_intf, 1, &i_newvol );
- sprintf( string, "Vol %%%d", i_newvol*100/AOUT_VOLUME_MAX );
- Feedback( p_intf, string );
+ sprintf( string, "Vol %d%%", i_newvol*100/AOUT_VOLUME_MAX );
+ vout_OSDMessage( VLC_OBJECT(p_intf), string );
}
- if( p_vout )
+ else if( i_action == ACTIONID_VOL_MUTE )
{
- if( i_key == i_fullscreen )
+ audio_volume_t i_newvol = -1;
+ aout_VolumeMute( p_intf, &i_newvol );
+ if( i_newvol == 0 )
+ {
+ vout_OSDMessage( VLC_OBJECT(p_intf), _( "Mute" ) );
+ }
+ else
+ {
+ char string[9];
+ sprintf( string, "Vol %d%%", i_newvol*100/AOUT_VOLUME_MAX );
+ vout_OSDMessage( VLC_OBJECT(p_intf), string );
+ }
+ }
+ else if( i_action == ACTIONID_FULLSCREEN )
+ {
+ if( p_vout )
{
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
- continue;
}
}
-
- if( i_key == i_play )
+ else if( i_action == ACTIONID_PLAY )
{
p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
vlc_object_release( p_playlist );
}
}
- continue;
}
-
- if( i_key == i_play_pause )
+ else if( i_action == ACTIONID_PLAY_PAUSE )
{
- if( p_input &&
- p_input->stream.control.i_status != PAUSE_S )
+ val.i_int = PLAYING_S;
+ if( p_input )
{
- Feedback( p_intf, _( "Pause" ) );
- input_SetStatus( p_input, INPUT_STATUS_PAUSE );
+ var_Get( p_input, "state", &val );
+ }
+ if( p_input && val.i_int != PAUSE_S )
+ {
+ vout_OSDMessage( VLC_OBJECT(p_intf), _( "Pause" ) );
+ val.i_int = PAUSE_S;
+ var_Set( p_input, "state", val );
}
else
{
if( p_playlist->i_size )
{
vlc_mutex_unlock( &p_playlist->object_lock );
- Feedback( p_intf, _( "Play" ) );
+ vout_OSDMessage( VLC_OBJECT(p_intf), _( "Play" ) );
playlist_Play( p_playlist );
vlc_object_release( p_playlist );
}
}
- }
- continue;
+ }
}
-
else if( p_input )
{
- if( i_key == i_pause )
+ if( i_action == ACTIONID_PAUSE )
+ {
+ vout_OSDMessage( VLC_OBJECT(p_intf), _( "Pause" ) );
+ val.i_int = PAUSE_S;
+ var_Set( p_input, "state", val );
+ }
+ else if( i_action == ACTIONID_JUMP_BACKWARD_10SEC )
+ {
+ vout_OSDMessage( VLC_OBJECT(p_intf), _( "Jump -10 seconds" ) );
+ val.i_time = -10000000;
+ var_Set( p_input, "time-offset", val );
+ }
+ else if( i_action == ACTIONID_JUMP_FORWARD_10SEC )
{
- Feedback( p_intf, _( "Pause" ) );
- input_SetStatus( p_input, INPUT_STATUS_PAUSE );
+ vout_OSDMessage( VLC_OBJECT(p_intf), _( "Jump +10 seconds" ) );
+ val.i_time = 10000000;
+ var_Set( p_input, "time-offset", val );
}
- else if( i_key == i_next )
+ else if( i_action == ACTIONID_JUMP_BACKWARD_1MIN )
+ {
+ vout_OSDMessage( VLC_OBJECT(p_intf), _( "Jump -1 minute" ) );
+ val.i_time = -60000000;
+ var_Set( p_input, "time-offset", val );
+ }
+ else if( i_action == ACTIONID_JUMP_FORWARD_1MIN )
+ {
+ vout_OSDMessage( VLC_OBJECT(p_intf), _( "Jump +1 minute" ) );
+ val.i_time = 60000000;
+ var_Set( p_input, "time-offset", val );
+ }
+ else if( i_action == ACTIONID_JUMP_BACKWARD_5MIN )
+ {
+ vout_OSDMessage( VLC_OBJECT(p_intf), _( "Jump -5 minutes" ) );
+ val.i_time = -300000000;
+ var_Set( p_input, "time-offset", val );
+ }
+ else if( i_action == ACTIONID_JUMP_FORWARD_5MIN )
+ {
+ vout_OSDMessage( VLC_OBJECT(p_intf), _( "Jump +5 minutes" ) );
+ val.i_time = 300000000;
+ var_Set( p_input, "time-offset", val );
+ }
+ else if( i_action == ACTIONID_NEXT )
{
p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
vlc_object_release( p_playlist );
}
}
- else if( i_key == i_prev )
+ else if( i_action == ACTIONID_PREV )
{
p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
vlc_object_release( p_playlist );
}
}
- else if( i_key == i_stop )
+ else if( i_action == ACTIONID_STOP )
{
p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
vlc_object_release( p_playlist );
}
}
- else if( i_key == i_faster )
+ else if( i_action == ACTIONID_FASTER )
{
- input_SetStatus( p_input, INPUT_STATUS_FASTER );
+ vlc_value_t val; val.b_bool = VLC_TRUE;
+ var_Set( p_input, "rate-faster", val );
}
- else if( i_key == i_slower )
+ else if( i_action == ACTIONID_FASTER )
{
- input_SetStatus( p_input, INPUT_STATUS_SLOWER );
+ vlc_value_t val; val.b_bool = VLC_TRUE;
+ var_Set( p_input, "rate-slower", val );
}
- }
-
- }
-}
+ else if( i_action == ACTIONID_POSITION )
+ {
+ playlist_t *p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ 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 );
+
+ if( p_playlist )
+ {
+ mtime_t dur =
+ p_playlist->pp_items[p_playlist->i_index]->i_duration;
-static void Feedback( intf_thread_t *p_intf, char *psz_string )
-{
- if ( p_intf->p_sys->p_vout )
- {
- vout_ShowTextRelative( p_intf->p_sys->p_vout, psz_string, NULL,
- OSD_ALIGN_TOP|OSD_ALIGN_RIGHT, 30,20,400000 );
+ i_seconds = time.i_time / 1000000;
+ secstotimestr ( psz_time, i_seconds );
+
+ if( dur != -1 )
+ {
+ char psz_position[2*MSTRTIME_MAX_SIZE + 3];
+ secstotimestr( psz_duration, dur/1000000 );
+ strcpy( psz_position, psz_time );
+ strcat( psz_position, " / " );
+ strcat( psz_position, psz_duration );
+ vout_OSDMessage( VLC_OBJECT(p_playlist), psz_position );
+ }
+ else if( i_seconds > 0 )
+ {
+ vout_OSDMessage( VLC_OBJECT(p_playlist), psz_time );
+ }
+ vlc_object_release( p_playlist );
+ }
+ }
+ else if( i_action >= ACTIONID_PLAY_BOOKMARK1 &&
+ i_action <= ACTIONID_PLAY_BOOKMARK10 )
+ {
+ PlayBookmark( p_intf, i_action - ACTIONID_PLAY_BOOKMARK1 + 1 );
+ }
+ else if( i_action >= ACTIONID_SET_BOOKMARK1 &&
+ i_action <= ACTIONID_SET_BOOKMARK10 )
+ {
+ SetBookmark( p_intf, i_action - ACTIONID_SET_BOOKMARK1 + 1 );
+ }
+ }
}
}
-static int GetKey ( intf_thread_t *p_intf)
+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 0;
+ return -1;
}
else
{
* KeyEvent: callback for keyboard events
*****************************************************************************/
static int KeyEvent( vlc_object_t *p_this, char const *psz_var,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+ 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" );
+ msg_Warn( p_intf, "event buffer full, dropping keypress" );
vlc_mutex_unlock( &p_intf->p_sys->change_lock );
return VLC_EGENERIC;
}
{
p_intf->p_sys->p_keys[ p_intf->p_sys->i_size ] = newval.i_int;
p_intf->p_sys->i_size++;
- }
+ }
vlc_mutex_unlock( &p_intf->p_sys->change_lock );
return VLC_SUCCESS;
}
+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;
+ 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;
+ }
+ }
+
+ return VLC_SUCCESS;
+}
+
+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 );
+
+ 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++)
+ {
+ if( !strcmp( psz_bookmark, p_playlist->pp_items[i_position]->psz_uri ) )
+ {
+ playlist_Goto( p_playlist, i_position );
+ break;
+ }
+ }
+ 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 )
+ {
+ 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]->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 );
+ }
+}
projects / vlc / blobdiff