X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fcontrol%2Fhotkeys.c;h=88b521057c1505bbd4cebd795fcbed487194f5bc;hb=d8059014cbe3ce58e12df71408e171d497a1dd31;hp=3ffd4ccc72ec200216c19fd64da05b1bd2367d61;hpb=1c2d8e7805f83edf1cd51f9de53eaace02b1c020;p=vlc

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 3ffd4ccc72..88b521057c 100644
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -30,7 +30,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_input.h>
 #include <vlc_vout.h>
@@ -93,8 +94,8 @@ static void ClearChannels  ( intf_thread_t *, vout_thread_t * );
 #define BOOKMARK_LONGTEXT N_("Define playlist bookmarks.")
 
 vlc_module_begin();
-    set_shortname( _("Hotkeys") );
-    set_description( _("Hotkeys management interface") );
+    set_shortname( N_("Hotkeys") );
+    set_description( N_("Hotkeys management interface") );
     set_capability( "interface", 0 );
     set_callbacks( Open, Close );
 vlc_module_end();
@@ -135,19 +136,16 @@ static void Close( vlc_object_t *p_this )
 static void Run( intf_thread_t *p_intf )
 {
     vout_thread_t *p_vout = NULL;
-    struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
     vlc_value_t val;
     int i;
     playlist_t *p_playlist = pl_Yield( p_intf );
 
     /* Initialize hotkey structure */
-    for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
+    for( struct hotkey *p_hotkey = p_intf->p_libvlc->p_hotkeys;
+         p_hotkey->psz_action != NULL;
+         p_hotkey++ )
     {
-        var_Create( p_intf->p_libvlc, p_hotkeys[i].psz_action,
-                    VLC_VAR_HOTKEY | VLC_VAR_DOINHERIT );
-
-        var_Get( p_intf->p_libvlc, p_hotkeys[i].psz_action, &val );
-        var_Set( p_intf->p_libvlc, p_hotkeys[i].psz_action, val );
+        p_hotkey->i_key = config_GetInt( p_intf, p_hotkey->psz_action );
     }
 
     for( ;; )
@@ -228,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", VLC_TRUE );
+            var_SetBool( p_intf->p_libvlc, "intf-show", true );
         else if( i_action == ACTIONID_INTF_HIDE )
-            var_SetBool( p_playlist, "intf-show", VLC_FALSE );
+            var_SetBool( p_intf->p_libvlc, "intf-show", false );
         /* Video Output actions */
         else if( i_action == ACTIONID_SNAPSHOT )
         {
@@ -255,7 +253,7 @@ static void Run( intf_thread_t *p_intf )
         {
             if( p_vout && var_GetBool( p_vout, "fullscreen" ) )
             {
-                var_SetBool( p_vout, "fullscreen", VLC_FALSE );
+                var_SetBool( p_vout, "fullscreen", false );
             }
         }
         else if( i_action == ACTIONID_ZOOM_QUARTER ||
@@ -298,19 +296,19 @@ static void Run( intf_thread_t *p_intf )
             vlc_value_t val2;
             var_Get( p_playlist, "loop", &val );
             var_Get( p_playlist, "repeat", &val2 );
-            if( val2.b_bool == VLC_TRUE )
+            if( val2.b_bool == true )
             {
-                val.b_bool = VLC_FALSE;
-                val2.b_bool = VLC_FALSE;
+                val.b_bool = false;
+                val2.b_bool = false;
             }
-            else if( val.b_bool == VLC_TRUE )
+            else if( val.b_bool == true )
             {
-                val.b_bool = VLC_FALSE;
-                val2.b_bool = VLC_TRUE;
+                val.b_bool = false;
+                val2.b_bool = true;
             }
             else
             {
-                val.b_bool = VLC_TRUE;
+                val.b_bool = true;
             }
             var_Set( p_playlist, "loop", val );
             var_Set( p_playlist, "repeat", val2 );
@@ -403,7 +401,7 @@ static void Run( intf_thread_t *p_intf )
              * How to get a valid value ?
              * That's not that easy with some special stream
              */
-            vlc_bool_t b_seekable = VLC_TRUE;
+            bool b_seekable = true;
             int i_interval =0;
 
             if( i_action == ACTIONID_PAUSE )
@@ -927,7 +925,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, VLC_TRUE,
+            playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true,
                               NULL, p_item );
             break;
         }
@@ -984,7 +982,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,
@@ -1001,7 +999,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 );