Skip to content

V
vlc-2-2
Commit f79d566e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Fix "play only" hotkey when playlist is stopped (i.e. no input) 

This fixes #3377.
parent 88e98172
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
modules/control/hotkeys.c
View file @ f79d566e
......@@ -313,6 +313,19 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
playlist_Play( p_playlist );
break;
case ACTIONID_PLAY:
if( p_input && var_GetFloat( p_input, "rate" ) != 1. )
/* Return to normal speed */
var_SetFloat( p_input, "rate", 1. );
else
{
ClearChannels( p_intf, p_vout );
vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
OSD_PLAY_ICON );
playlist_Play( p_playlist );
}
break;
case ACTIONID_AUDIODEVICE_CYCLE:
{
if( !p_aout )
......@@ -825,19 +838,6 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
_( "Audio delay %i ms" ),
(int)(i_delay/1000) );
}
else if( i_action == ACTIONID_PLAY )
{
if( var_GetFloat( p_input, "rate" ) != 1. )
/* Return to normal speed */
var_SetFloat( p_input, "rate", 1. );
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) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment