* use Play icon for play-only hotkey

[vlc] / modules / control / hotkeys.c

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index ea7c7e5a88b0a37b47c04fc5c61761a13dbd57bf..e4468e50b2d43016e025d3685a5508f4c6d7aaf8 100644 (file)
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -379,11 +379,15 @@ static void Run( intf_thread_t *p_intf )
 
             if( i_action == ACTIONID_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 );
+                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 )
@@ -818,7 +822,7 @@ static void Run( intf_thread_t *p_intf )
                     {
                         ClearChannels( p_intf, p_vout );
                         vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
-                                      OSD_PAUSE_ICON );
+                                      OSD_PLAY_ICON );
                         playlist_Play( p_playlist );
                     }
                     vlc_object_release( p_playlist );
@@ -921,7 +925,7 @@ static void PlayBookmark( intf_thread_t *p_intf, int i_num )
             if( !strcmp( psz_bookmark,
                          p_playlist->pp_items[i]->p_input->psz_uri ) )
             {
-                playlist_LockControl( p_playlist, PLAYLIST_ITEMPLAY,
+                playlist_LockControl( p_playlist, PLAYLIST_VIEWPLAY, NULL,
                                       p_playlist->pp_items[i] );
                 break;
             }