Merge branch 'master' of git://git.videolan.org/vlc

[vlc] / src / osd / osd.c

diff --git a/src/osd/osd.c b/src/osd/osd.c
index 4041c6ef8a8fc64c078abd323d2891938aaf9d5e..086abf8c87e3acdbc7c523189aea5e440b64ea62 100644 (file)
--- a/src/osd/osd.c
+++ b/src/osd/osd.c
@@ -33,6 +33,7 @@
 #include <vlc_keys.h>
 #include <vlc_osd.h>
 #include <vlc_image.h>
+#include <vlc_modules.h>
 
 #include "libvlc.h"
 
@@ -153,8 +154,8 @@ osd_menu_t *osd_MenuCreate( vlc_object_t *p_this, const char *psz_file )
     p_lock = osd_GetMutex( p_this );
     vlc_mutex_lock( p_lock );
 
-    var_Create( p_this->p_libvlc, "osd", VLC_VAR_ADDRESS );
-    var_Get( p_this->p_libvlc, "osd", &val );
+    var_Create( p_this->p_libvlc, "osd-object", VLC_VAR_ADDRESS );
+    var_Get( p_this->p_libvlc, "osd-object", &val );
     if( val.p_address == NULL )
     {
         static const char osdmenu_name[] = "osd menu";
@@ -200,7 +201,7 @@ osd_menu_t *osd_MenuCreate( vlc_object_t *p_this, const char *psz_file )
         var_SetBool( p_osd, "osd-menu-visible", false );
 
         val.p_address = p_osd;
-        var_Set( p_this->p_libvlc, "osd", val );
+        var_Set( p_this->p_libvlc, "osd-object", val );
     }
     else
         p_osd = val.p_address;
@@ -232,7 +233,7 @@ void osd_MenuDelete( vlc_object_t *p_this, osd_menu_t *p_osd )
         var_Destroy( p_osd, "osd-menu-update" );
         osd_ParserUnload( p_osd );
         val.p_address = NULL;
-        var_Set( p_this->p_libvlc, "osd", val );
+        var_Set( p_this->p_libvlc, "osd-object", val );
     }
 
     vlc_object_release( p_osd );
@@ -243,7 +244,7 @@ static osd_menu_t *osd_Find( vlc_object_t *p_this )
 {
     vlc_value_t val;
 
-    if( var_Get( p_this->p_libvlc, "osd", &val ) )
+    if( var_Get( p_this->p_libvlc, "osd-object", &val ) )
         return NULL;
     return val.p_address;
 }
@@ -399,7 +400,7 @@ void osd_MenuActivate( vlc_object_t *p_this )
                            var_InheritInteger( p_osd, p_button->psz_action ) );
 #if defined(OSD_MENU_DEBUG)
         msg_Dbg( p_osd, "select (%d, %s)",
-                 var_InheritInteger( p_osd, p_button->psz_action ),
+                 (int)var_InheritInteger( p_osd, p_button->psz_action ),
                  p_button->psz_action );
 #endif
     }
@@ -550,7 +551,7 @@ void osd_MenuUp( vlc_object_t *p_this )
             osd_SetKeyPressed( VLC_OBJECT(p_osd->p_libvlc),
                                var_InheritInteger(p_osd, p_button->psz_action) );
 #if defined(OSD_MENU_DEBUG)
-            msg_Dbg( p_osd, "select (%d, %s)", val.i_int, p_button->psz_action );
+            msg_Dbg( p_osd, "select (%"PRId64", %s)", val.i_int, p_button->psz_action );
 #endif
         }
     }
@@ -617,7 +618,7 @@ void osd_MenuDown( vlc_object_t *p_this )
             osd_SetKeyPressed( VLC_OBJECT(p_osd->p_libvlc),
                                var_InheritInteger(p_osd, p_button->psz_action_down) );
 #if defined(OSD_MENU_DEBUG)
-            msg_Dbg( p_osd, "select (%d, %s)", val.i_int, p_button->psz_action_down );
+            msg_Dbg( p_osd, "select (%"PRId64", %s)", val.i_int, p_button->psz_action_down );
 #endif
         }
     }