X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Fhotkeys.c;h=f79b0ea2c83f9d8ec2613b8c0bc55ddcdeefd8ca;hb=04804702d97e0667fdf05ed3ceeae6759fe732d4;hp=27993b1b5366aaaa8d480228703ef61e559b1ecb;hpb=13ae40b0efc4f1b1ce205d9a057537047fcab3f4;p=vlc

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 27993b1b53..f79b0ea2c8 100644
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_input.h>
@@ -226,9 +226,9 @@ static void Run( intf_thread_t *p_intf )
         }
         /* Interface showing */
         else if( i_action == ACTIONID_INTF_SHOW )
-            var_SetBool( p_playlist, "intf-show", true );
+            var_SetBool( p_intf->p_libvlc, "intf-show", true );
         else if( i_action == ACTIONID_INTF_HIDE )
-            var_SetBool( p_playlist, "intf-show", false );
+            var_SetBool( p_intf->p_libvlc, "intf-show", false );
         /* Video Output actions */
         else if( i_action == ACTIONID_SNAPSHOT )
         {
@@ -397,11 +397,7 @@ static void Run( intf_thread_t *p_intf )
         /* Input options */
         else if( p_input )
         {
-            /* FIXME --fenrir
-             * How to get a valid value ?
-             * That's not that easy with some special stream
-             */
-            bool b_seekable = true;
+            bool b_seekable = var_GetBool( p_input, "seekable" );
             int i_interval =0;
 
             if( i_action == ACTIONID_PAUSE )
@@ -568,6 +564,8 @@ static void Run( intf_thread_t *p_intf )
                     vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                      _("Aspect ratio: %s"),
                                      text_list.p_list->p_values[i].psz_string );
+
+                    var_Change( p_vout, "aspect-ratio", VLC_VAR_FREELIST, &val_list, &text_list );
                 }
                 free( val.psz_string );
             }
@@ -594,6 +592,8 @@ static void Run( intf_thread_t *p_intf )
                     vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                      _("Crop: %s"),
                                      text_list.p_list->p_values[i].psz_string );
+
+                    var_Change( p_vout, "crop", VLC_VAR_FREELIST, &val_list, &text_list );
                 }
                 free( val.psz_string );
             }
@@ -620,6 +620,8 @@ static void Run( intf_thread_t *p_intf )
                     vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                      _("Deinterlace mode: %s"),
                                      text_list.p_list->p_values[i].psz_string );
+
+                    var_Change( p_vout, "deinterlace", VLC_VAR_FREELIST, &val_list, &text_list );
                 }
                 free( val.psz_string );
             }
@@ -650,6 +652,8 @@ static void Run( intf_thread_t *p_intf )
                     vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                      _("Zoom mode: %s"),
                                 text_list.p_list->p_values[i].var.psz_name );
+
+                    var_Change( p_vout, "zoom", VLC_VAR_FREELIST, &val_list, &text_list );
                 }
             }
             else if( i_action == ACTIONID_CROP_TOP && p_vout )
@@ -925,7 +929,7 @@ static void PlayBookmark( intf_thread_t *p_intf, int i_num )
         if( !strcmp( psz_bookmark, psz_uri ) )
         {
             free( psz_uri );
-            playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true,
+            playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked,
                               NULL, p_item );
             break;
         }
@@ -982,7 +986,7 @@ static void DisplayPosition( intf_thread_t *p_intf, vout_thread_t *p_vout,
         vout_OSDMessage( p_input, POSITION_TEXT_CHAN, psz_time );
     }
 
-    if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
+    if( !p_vout->p_window || p_vout->b_fullscreen )
     {
         var_Get( p_input, "position", &pos );
         vout_OSDSlider( VLC_OBJECT( p_input ), POSITION_WIDGET_CHAN,
@@ -999,7 +1003,7 @@ static void DisplayVolume( intf_thread_t *p_intf, vout_thread_t *p_vout,
     }
     ClearChannels( p_intf, p_vout );
 
-    if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
+    if( !p_vout->p_window || p_vout->b_fullscreen )
     {
         vout_OSDSlider( VLC_OBJECT( p_vout ), VOLUME_WIDGET_CHAN,
             i_vol*100/AOUT_VOLUME_MAX, OSD_VERT_SLIDER );