X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Fhotkeys.c;h=21d7b4f387c20930d999d1d6c4890ee530834f84;hb=15de5e20fa5f4301927576fa6cae7758d6742dde;hp=deb6ce17fde3881b31863c325cd8f860ba55ac1b;hpb=b4e738fdf4e74e02c279ee7013141aa639c03966;p=vlc diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c old mode 100755 new mode 100644 index deb6ce17fd..21d7b4f387 --- a/modules/control/hotkeys.c +++ b/modules/control/hotkeys.c @@ -1,7 +1,7 @@ /***************************************************************************** * hotkeys.c: Hotkey handling for vlc ***************************************************************************** - * Copyright (C) 2004 VideoLAN + * Copyright (C) 2005 the VideoLAN team * $Id$ * * Authors: Sigmund Augdal @@ -36,6 +36,12 @@ #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 *****************************************************************************/ @@ -48,6 +54,8 @@ struct intf_sys_t 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 */ }; @@ -65,8 +73,9 @@ 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 ); -static void DisplayPosition( vout_thread_t *, input_thread_t * ); -static void DisplayVolume ( vout_thread_t *, audio_volume_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 @@ -163,6 +172,7 @@ static void Run( intf_thread_t *p_intf ) playlist_t *p_playlist; input_thread_t *p_input; vout_thread_t *p_vout = NULL; + vout_thread_t *p_last_vout; struct hotkey *p_hotkeys = p_intf->p_vlc->p_hotkeys; vlc_value_t val; int i; @@ -200,6 +210,7 @@ static void Run( intf_thread_t *p_intf ) 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 ); @@ -212,10 +223,20 @@ static void Run( intf_thread_t *p_intf ) 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 ) { @@ -232,21 +253,30 @@ static void Run( intf_thread_t *p_intf ) 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; - vout_OSDMessage( p_intf, SOLO_CHAN, _( "Quit" ) ); + 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 ); - DisplayVolume( p_vout, i_newvol ); + 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_vout, i_newvol ); + DisplayVolume( p_intf, p_vout, i_newvol ); } else if( i_action == ACTIONID_VOL_MUTE ) { @@ -256,43 +286,93 @@ static void Run( intf_thread_t *p_intf ) { if( i_newvol == 0 ) { - vout_OSDIcon( VLC_OBJECT( p_intf ), OSD_MUTE_ICON ); + ClearChannels( p_intf, p_vout ); + vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN, + OSD_MUTE_ICON ); } else { - DisplayVolume( p_vout, i_newvol ); + 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, SOLO_CHAN, "Subtitle delay %i ms", - i_delay*100); + 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 -= 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 ) { - int i_delay; - if( input_Control( p_input, INPUT_GET_SUBDELAY, &i_delay ) == - VLC_SUCCESS ) - { - i_delay++; - input_Control( p_input, INPUT_SET_SUBDELAY, i_delay ); - vout_OSDMessage( p_intf, SOLO_CHAN, "Subtitle delay %i ms", - i_delay*100); - } + 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_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 ) { @@ -300,6 +380,9 @@ static void Run( intf_thread_t *p_intf ) FIND_ANYWHERE ); if( p_playlist ) { + 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 ); } @@ -313,7 +396,9 @@ static void Run( intf_thread_t *p_intf ) } if( p_input && val.i_int != PAUSE_S ) { - vout_OSDIcon( VLC_OBJECT( p_intf ), OSD_PAUSE_ICON ); + 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 ); } @@ -323,7 +408,9 @@ static void Run( intf_thread_t *p_intf ) FIND_ANYWHERE ); if( p_playlist ) { - vout_OSDIcon( VLC_OBJECT( p_intf ), OSD_PLAY_ICON ); + 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 ); } @@ -331,11 +418,17 @@ static void Run( intf_thread_t *p_intf ) } 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; if( i_action == ACTIONID_PAUSE ) { - vout_OSDMessage( p_intf, SOLO_CHAN, _( "Pause" ) ); + ClearChannels( p_intf, p_vout ); + vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN, + OSD_PAUSE_ICON ); val.i_int = PAUSE_S; var_Set( p_input, "state", val ); } @@ -343,37 +436,123 @@ static void Run( intf_thread_t *p_intf ) { val.i_time = -10000000; var_Set( p_input, "time-offset", val ); - DisplayPosition( p_vout, p_input ); + DisplayPosition( p_intf, p_vout, p_input ); } else if( i_action == ACTIONID_JUMP_FORWARD_10SEC && b_seekable ) { val.i_time = 10000000; var_Set( p_input, "time-offset", val ); - DisplayPosition( p_vout, p_input ); + DisplayPosition( p_intf, p_vout, p_input ); } else if( i_action == ACTIONID_JUMP_BACKWARD_1MIN && b_seekable ) { val.i_time = -60000000; var_Set( p_input, "time-offset", val ); - DisplayPosition( p_vout, p_input ); + DisplayPosition( p_intf, p_vout, p_input ); } else if( i_action == ACTIONID_JUMP_FORWARD_1MIN && b_seekable ) { val.i_time = 60000000; var_Set( p_input, "time-offset", val ); - DisplayPosition( p_vout, p_input ); + DisplayPosition( p_intf, p_vout, p_input ); } else if( i_action == ACTIONID_JUMP_BACKWARD_5MIN && b_seekable ) { val.i_time = -300000000; var_Set( p_input, "time-offset", val ); - DisplayPosition( p_vout, p_input ); + DisplayPosition( p_intf, p_vout, p_input ); } else if( i_action == ACTIONID_JUMP_FORWARD_5MIN && b_seekable ) { val.i_time = 300000000; var_Set( p_input, "time-offset", val ); - DisplayPosition( p_vout, p_input ); + DisplayPosition( p_intf, p_vout, p_input ); + } + 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 ) + { + var_Set( p_input, "audio-es", + list.p_list->p_values[1] ); + i = 1; + } + else + { + var_Set( p_input, "audio-es", + list.p_list->p_values[i+1] ); + i++; + } + vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, + _("Audio track: %s"), + list2.p_list->p_values[i].psz_string ); + } + else if( i_action == ACTIONID_SUBTITLE_TRACK ) + { + vlc_value_t val, list, list2; + int i_count, i; + var_Get( p_input, "spu-es", &val ); + + var_Change( p_input, "spu-es", VLC_VAR_GETCHOICES, + &list, &list2 ); + i_count = list.p_list->i_count; + if( i_count <= 1 ) + { + vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, _("Subtitle track: %s"), _("N/A") ); + continue; + } + for( i = 0; i < i_count; i++ ) + { + if( val.i_int == list.p_list->p_values[i].i_int ) + { + break; + } + } + /* value of spu-es was not in choices list */ + if( i == i_count ) + { + msg_Warn( p_input, "invalid current subtitle track, selecting 0" ); + var_Set( p_input, "spu-es", list.p_list->p_values[0] ); + i = 0; + } + else if( i == i_count - 1 ) + { + var_Set( p_input, "spu-es", list.p_list->p_values[0] ); + i = 0; + } + else + { + var_Set( p_input, "spu-es", list.p_list->p_values[i+1] ); + i = i + 1; + } + vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, + _("Subtitle track: %s"), + list2.p_list->p_values[i].psz_string ); } else if( i_action == ACTIONID_NEXT ) { @@ -381,6 +560,7 @@ static void Run( intf_thread_t *p_intf ) FIND_ANYWHERE ); if( p_playlist ) { + vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, _("Next") ); playlist_Next( p_playlist ); vlc_object_release( p_playlist ); } @@ -391,6 +571,7 @@ static void Run( intf_thread_t *p_intf ) FIND_ANYWHERE ); if( p_playlist ) { + vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, _("Previous") ); playlist_Prev( p_playlist ); vlc_object_release( p_playlist ); } @@ -409,15 +590,17 @@ static void Run( intf_thread_t *p_intf ) { 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; 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 ) { - DisplayPosition( p_vout, p_input ); + DisplayPosition( p_intf, p_vout, p_input ); } else if( i_action >= ACTIONID_PLAY_BOOKMARK1 && i_action <= ACTIONID_PLAY_BOOKMARK10 ) @@ -527,7 +710,6 @@ static void PlayBookmark( intf_thread_t *p_intf, int i_num ) 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 ) @@ -536,15 +718,20 @@ static void SetBookmark( intf_thread_t *p_intf, int i_num ) 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 ); } } -static void DisplayPosition( vout_thread_t *p_vout, input_thread_t *p_input ) +static void DisplayPosition( intf_thread_t *p_intf, vout_thread_t *p_vout, + input_thread_t *p_input ) { char psz_duration[MSTRTIME_MAX_SIZE]; char psz_time[MSTRTIME_MAX_SIZE]; @@ -555,6 +742,7 @@ static void DisplayPosition( vout_thread_t *p_vout, input_thread_t *p_input ) { return; } + ClearChannels( p_intf, p_vout ); var_Get( p_input, "time", &time ); i_seconds = time.i_time / 1000000; @@ -564,37 +752,54 @@ static void DisplayPosition( vout_thread_t *p_vout, input_thread_t *p_input ) if( time.i_time > 0 ) { secstotimestr( psz_duration, time.i_time / 1000000 ); - vout_OSDMessage( p_input, POSITION_CHAN, "%s / %s", + vout_OSDMessage( p_input, POSITION_TEXT_CHAN, "%s / %s", psz_time, psz_duration ); } else if( i_seconds > 0 ) { - vout_OSDMessage( p_input, POSITION_CHAN, psz_time ); + vout_OSDMessage( p_input, POSITION_TEXT_CHAN, psz_time ); } if( !p_vout->p_parent_intf || p_vout->b_fullscreen ) { var_Get( p_input, "position", &pos ); - vout_OSDSlider( VLC_OBJECT( p_input ), POSITION_CHAN, + vout_OSDSlider( VLC_OBJECT( p_input ), POSITION_WIDGET_CHAN, pos.f_float * 100, OSD_HOR_SLIDER ); } } -static void DisplayVolume( vout_thread_t *p_vout, audio_volume_t i_vol ) +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_CHAN, + vout_OSDSlider( VLC_OBJECT( p_vout ), VOLUME_WIDGET_CHAN, i_vol*100/AOUT_VOLUME_MAX, OSD_VERT_SLIDER ); } else { - vout_OSDMessage( p_vout, VOLUME_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 ); + } +} + +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 ] ); + } } }