/*****************************************************************************
* hotkeys.c: Hotkey handling for vlc
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2005 the VideoLAN team
* $Id$
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
+ * 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
#include <vlc/input.h>
#include <vlc/vout.h>
#include <vlc/aout.h>
-#include <osd.h>
+#include <vlc_osd.h>
#include "vlc_keys.h"
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
+ var_DelCallback( p_intf->p_vlc, "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;
- vout_thread_t *p_last_vout;
+ vout_thread_t *p_last_vout = NULL;
struct hotkey *p_hotkeys = p_intf->p_vlc->p_hotkeys;
vlc_value_t val;
int i;
while( !p_intf->b_die )
{
int i_key, i_action;
+ int i_times = 0;
/* Sleep a bit */
msleep( INTF_IDLE_SLEEP );
{
for( i = 0; i < CHANNELS_NUMBER; i++ )
{
- p_intf->p_sys->p_channels[ i ] =
- vout_RegisterOSDChannel( p_vout );
+ 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_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_vlc->b_die = VLC_TRUE;
ClearChannels( p_intf, p_vout );
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Quit" ) );
}
}
}
-
+ else if( i_action == ACTIONID_INTF_SHOW )
+ {
+ val.b_bool = VLC_TRUE;
+ p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist )
+ {
+ var_Set( p_playlist, "intf-show", val );
+ vlc_object_release( p_playlist );
+ }
+ }
+ else if( i_action == ACTIONID_INTF_HIDE )
+ {
+ val.b_bool = VLC_FALSE;
+ p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist )
+ {
+ var_Set( p_playlist, "intf-show", val );
+ vlc_object_release( p_playlist );
+ }
+ }
+ else if( i_action == ACTIONID_SNAPSHOT )
+ {
+ if( p_vout ) vout_Control( p_vout, VOUT_SNAPSHOT );
+ }
else if( i_action == ACTIONID_SUBDELAY_DOWN )
{
int64_t i_delay = var_GetTime( p_input, "spu-delay" );
- i_delay -= 10000; /* 10 ms */
+ i_delay -= 50000; /* 50 ms */
var_SetTime( p_input, "spu-delay", i_delay );
ClearChannels( p_intf, p_vout );
{
int64_t i_delay = var_GetTime( p_input, "spu-delay" );
- i_delay += 10000; /* 10 ms */
+ 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_FULLSCREEN && p_vout )
+ else if( i_action == ACTIONID_AUDIODELAY_DOWN )
{
- var_Get( p_vout, "fullscreen", &val );
- var_Set( p_vout, "fullscreen", (vlc_value_t)!val.b_bool );
+ 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_FULLSCREEN )
+ {
+ if( p_vout )
+ {
+ var_Get( p_vout, "fullscreen", &val ); val.b_bool = !val.b_bool;
+ var_Set( p_vout, "fullscreen", val );
+ }
+ else
+ {
+ p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ 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 )
{
FIND_ANYWHERE );
if( p_playlist )
{
- playlist_Play( 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_PAUSE_ICON );
+ playlist_Play( p_playlist );
+ }
vlc_object_release( p_playlist );
}
+
}
else if( i_action == ACTIONID_PLAY_PAUSE )
{
val.i_int = PAUSE_S;
var_Set( p_input, "state", val );
}
+ else if( i_action == ACTIONID_JUMP_BACKWARD_3SEC && b_seekable )
+ {
+ val.i_time = (-3000000 * ((mtime_t)(1 << i_times)));
+ var_Set( p_input, "time-offset", val );
+ DisplayPosition( p_intf, p_vout, p_input );
+ }
+ else if( i_action == ACTIONID_JUMP_FORWARD_3SEC && b_seekable )
+ {
+ val.i_time = (3000000 * ((mtime_t)(1 << i_times)));
+ var_Set( p_input, "time-offset", val );
+ DisplayPosition( p_intf, p_vout, p_input );
+ }
else if( i_action == ACTIONID_JUMP_BACKWARD_10SEC && b_seekable )
{
- val.i_time = -10000000;
+ val.i_time = (-10000000 * ((mtime_t)(1 << i_times)));
var_Set( p_input, "time-offset", val );
DisplayPosition( p_intf, p_vout, p_input );
}
else if( i_action == ACTIONID_JUMP_FORWARD_10SEC && b_seekable )
{
- val.i_time = 10000000;
+ val.i_time = (10000000 * ((mtime_t)(1 << i_times)));
var_Set( p_input, "time-offset", val );
DisplayPosition( p_intf, p_vout, p_input );
}
else if( i_action == ACTIONID_JUMP_BACKWARD_1MIN && b_seekable )
{
- val.i_time = -60000000;
+ val.i_time = (-60000000 * ((mtime_t)(1 << i_times)));
var_Set( p_input, "time-offset", val );
DisplayPosition( p_intf, p_vout, p_input );
}
else if( i_action == ACTIONID_JUMP_FORWARD_1MIN && b_seekable )
{
- val.i_time = 60000000;
+ val.i_time = (60000000 * ((mtime_t)(1 << i_times)));
var_Set( p_input, "time-offset", val );
DisplayPosition( p_intf, p_vout, p_input );
}
else if( i_action == ACTIONID_JUMP_BACKWARD_5MIN && b_seekable )
{
- val.i_time = -300000000;
+ val.i_time = (-300000000 * ((mtime_t)(1 << i_times)));
var_Set( p_input, "time-offset", val );
DisplayPosition( p_intf, p_vout, p_input );
}
else if( i_action == ACTIONID_JUMP_FORWARD_5MIN && b_seekable )
{
- val.i_time = 300000000;
+ val.i_time = (300000000 * ((mtime_t)(1 << i_times)));
var_Set( p_input, "time-offset", val );
DisplayPosition( p_intf, p_vout, p_input );
}
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 )
else if( i == i_count - 1 )
{
var_Set( p_input, "audio-es",
- list.p_list->p_values[0] );
- i = 0;
+ list.p_list->p_values[1] );
+ i = 1;
}
else
{
_("Audio track: %s"),
list2.p_list->p_values[i].psz_string );
}
- else if( i_action = ACTIONID_SUBTITLE_TRACK )
+ 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 audio-es was not in choices list */
+ /* value of spu-es was not in choices list */
if( i == i_count )
{
msg_Warn( p_input, "invalid current subtitle track, selecting 0" );
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 && b_seekable )
{
{
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 );
+ }
}
}
}
{
vlc_t *p_vlc = (vlc_t *)p_this;
struct hotkey *p_hotkeys = p_vlc->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 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->input.psz_uri);
+ msg_Info( p_intf, "setting playlist bookmark %i to %s", i_num,
+ p_playlist->status.p_item->input.psz_uri);
+ config_SaveConfigFile( p_intf, "hotkeys" );
+ }
vlc_object_release( p_playlist );
}
}
}
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