X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fosd%2Fosd.c;h=4041c6ef8a8fc64c078abd323d2891938aaf9d5e;hb=08a73f8b3328767ed9f903bc9913a8dfe27d5079;hp=945bf74bf4cccef910c7e40ecb52d828747f6384;hpb=712a60c2557ecd142c9d29835142a23e6f477682;p=vlc

diff --git a/src/osd/osd.c b/src/osd/osd.c
index 945bf74bf4..4041c6ef8a 100644
--- a/src/osd/osd.c
+++ b/src/osd/osd.c
@@ -45,16 +45,21 @@
 static void osd_UpdateState( osd_menu_state_t *, int, int, int, int, picture_t * );
 static inline osd_state_t *osd_VolumeStateChange( osd_state_t *, int );
 static int osd_VolumeStep( vlc_object_t *, int, int );
-static bool osd_isVisible( osd_menu_t *p_osd );
 static bool osd_ParserLoad( osd_menu_t *, const char * );
 static void osd_ParserUnload( osd_menu_t * );
 
-static bool osd_isVisible( osd_menu_t *p_osd )
+static inline bool osd_isVisible( osd_menu_t *p_osd )
 {
-    vlc_value_t val;
+    return var_GetBool( p_osd, "osd-menu-visible" );
+}
+
+static vlc_mutex_t *osd_GetMutex( vlc_object_t *p_this )
+{
+    vlc_value_t lockval;
 
-    var_Get( p_osd, "osd-menu-visible", &val );
-    return val.b_bool;
+    var_Create( p_this->p_libvlc, "osd_mutex", VLC_VAR_MUTEX );
+    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+    return lockval.p_address;
 }
 
 /*****************************************************************************
@@ -68,17 +73,17 @@ static bool osd_ParserLoad( osd_menu_t *p_menu, const char *psz_file )
     if( !p_menu->p_image || !p_menu->psz_file )
     {
         msg_Err( p_menu, "unable to load images, aborting .." );
-        return true;
+        return false;
     }
     else
     {
-        char *psz_type;
-        char *psz_ext = strrchr( p_menu->psz_file, '.' );
+        const char *psz_type;
+        const char *psz_ext = strrchr( p_menu->psz_file, '.' );
 
         if( psz_ext && !strcmp( psz_ext, ".cfg") )
-            psz_type = (char*)"import-osd";
+            psz_type = "import-osd";
         else
-            psz_type = (char*)"import-osd-xml";
+            psz_type = "import-osd-xml";
 
         p_menu->p_parser = module_need( p_menu, "osd parser",
                                         psz_type, true );
@@ -104,8 +109,8 @@ static void osd_ParserUnload( osd_menu_t *p_menu )
 /**
  * Change state on an osd_button_t.
  *
- * This function selects the specified state and returns a pointer vlc_custom_createto it. The
- * following states are currently supported:
+ * This function selects the specified state and returns a pointer
+ * vlc_custom_create to it. The following states are currently supported:
  * \see OSD_BUTTON_UNSELECT
  * \see OSD_BUTTON_SELECT
  * \see OSD_BUTTON_PRESSED
@@ -116,7 +121,7 @@ static osd_state_t *osd_StateChange( osd_button_t *p_button, const int i_state )
     osd_state_t *p_temp = NULL;
     int i = 0;
 
-    for( i=0; p_current != NULL; i++ )
+    for( i= 0; p_current != NULL; i++ )
     {
         if( p_current->i_state == i_state )
         {
@@ -132,22 +137,23 @@ static osd_state_t *osd_StateChange( osd_button_t *p_button, const int i_state )
     return p_button->p_states;
 }
 
+#undef osd_MenuCreate
 /*****************************************************************************
  * OSD menu Funtions
  *****************************************************************************/
-osd_menu_t *__osd_MenuCreate( vlc_object_t *p_this, const char *psz_file )
+osd_menu_t *osd_MenuCreate( vlc_object_t *p_this, const char *psz_file )
 {
     osd_menu_t  *p_osd = NULL;
-    vlc_value_t lockval, val;
+    vlc_value_t val;
+    vlc_mutex_t *p_lock;
     int         i_volume = 0;
     int         i_steps = 0;
 
     /* to be sure to avoid multiple creation */
-    var_Create( p_this->p_libvlc, "osd_mutex", VLC_VAR_MUTEX );
-    var_Create( p_this->p_libvlc, "osd", VLC_VAR_ADDRESS );
-    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
-    vlc_mutex_lock( lockval.p_address );
+    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 );
     if( val.p_address == NULL )
     {
@@ -199,23 +205,24 @@ osd_menu_t *__osd_MenuCreate( vlc_object_t *p_this, const char *psz_file )
     else
         p_osd = val.p_address;
     vlc_object_hold( p_osd );
-    vlc_mutex_unlock( lockval.p_address );
+    vlc_mutex_unlock( p_lock );
     return p_osd;
 
 error:
-    vlc_mutex_unlock( lockval.p_address );
-    __osd_MenuDelete( p_this, p_osd );
+    vlc_mutex_unlock( p_lock );
+    osd_MenuDelete( p_this, p_osd );
     return NULL;
 }
 
-void __osd_MenuDelete( vlc_object_t *p_this, osd_menu_t *p_osd )
+#undef osd_MenuDelete
+void osd_MenuDelete( vlc_object_t *p_this, osd_menu_t *p_osd )
 {
-    vlc_value_t lockval;
+    vlc_mutex_t *p_lock;
 
     if( !p_osd || !p_this ) return;
 
-    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
-    vlc_mutex_lock( lockval.p_address );
+    p_lock = osd_GetMutex( p_this );
+    vlc_mutex_lock( p_lock );
 
     if( vlc_internals( VLC_OBJECT(p_osd) )->i_refcount == 1 )
     {
@@ -229,7 +236,7 @@ void __osd_MenuDelete( vlc_object_t *p_this, osd_menu_t *p_osd )
     }
 
     vlc_object_release( p_osd );
-    vlc_mutex_unlock( lockval.p_address );
+    vlc_mutex_unlock( p_lock );
 }
 
 static osd_menu_t *osd_Find( vlc_object_t *p_this )
@@ -272,18 +279,18 @@ static void osd_UpdateState( osd_menu_state_t *p_state, int i_x, int i_y,
     p_state->p_pic = p_pic;
 }
 
-void __osd_MenuShow( vlc_object_t *p_this )
+#undef osd_MenuShow
+void osd_MenuShow( vlc_object_t *p_this )
 {
     osd_menu_t *p_osd;
     osd_button_t *p_button = NULL;
-    vlc_value_t lockval;
+    vlc_mutex_t *p_lock = osd_GetMutex( p_this );
 
-    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
-    vlc_mutex_lock( lockval.p_address );
+    vlc_mutex_lock( p_lock );
     p_osd = osd_Find( p_this );
     if( p_osd == NULL )
     {
-        vlc_mutex_unlock( lockval.p_address );
+        vlc_mutex_unlock( p_lock );
         msg_Err( p_this, "osd_MenuShow failed" );
         return;
     }
@@ -311,21 +318,21 @@ void __osd_MenuShow( vlc_object_t *p_this )
     }
     osd_SetMenuVisible( p_osd, true );
 
-    vlc_mutex_unlock( lockval.p_address );
+    vlc_mutex_unlock( p_lock );
 }
 
-void __osd_MenuHide( vlc_object_t *p_this )
+#undef osd_MenuHide
+void osd_MenuHide( vlc_object_t *p_this )
 {
     osd_menu_t *p_osd;
-    vlc_value_t lockval;
+    vlc_mutex_t *p_lock = osd_GetMutex( p_this );
 
-    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
-    vlc_mutex_lock( lockval.p_address );
+    vlc_mutex_lock( p_lock );
 
     p_osd = osd_Find( p_this );
     if( p_osd == NULL )
     {
-        vlc_mutex_unlock( lockval.p_address );
+        vlc_mutex_unlock( p_lock );
         msg_Err( p_this, "osd_MenuHide failed" );
         return;
     }
@@ -338,22 +345,22 @@ void __osd_MenuHide( vlc_object_t *p_this )
                 0, 0, NULL );
     osd_SetMenuUpdate( p_osd, true );
 
-    vlc_mutex_unlock( lockval.p_address );
+    vlc_mutex_unlock( p_lock );
 }
 
-void __osd_MenuActivate( vlc_object_t *p_this )
+#undef osd_MenuActivate
+void osd_MenuActivate( vlc_object_t *p_this )
 {
     osd_menu_t *p_osd;
     osd_button_t *p_button = NULL;
-    vlc_value_t lockval;
+    vlc_mutex_t *p_lock = osd_GetMutex( p_this );
 
-    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
-    vlc_mutex_lock( lockval.p_address );
+    vlc_mutex_lock( p_lock );
 
     p_osd = osd_Find( p_this );
     if( p_osd == NULL || !osd_isVisible( p_osd ) )
     {
-        vlc_mutex_unlock( lockval.p_address );
+        vlc_mutex_unlock( p_lock );
         msg_Err( p_this, "osd_MenuActivate failed" );
         return;
     }
@@ -367,14 +374,14 @@ void __osd_MenuActivate( vlc_object_t *p_this )
      */
     if( p_button && p_button->p_up )
     {
-        vlc_mutex_unlock( lockval.p_address );
-        __osd_MenuUp( p_this );   /* "menu select" means go to menu item above. */
+        vlc_mutex_unlock( p_lock );
+        osd_MenuUp( p_this );   /* "menu select" means go to menu item above. */
         return;
     }
     if( p_button && p_button->p_down )
     {
-        vlc_mutex_unlock( lockval.p_address );
-        __osd_MenuDown( p_this ); /* "menu select" means go to menu item below. */
+        vlc_mutex_unlock( p_lock );
+        osd_MenuDown( p_this ); /* "menu select" means go to menu item below. */
         return;
     }
 
@@ -388,27 +395,30 @@ void __osd_MenuActivate( vlc_object_t *p_this )
                 p_button->p_current_state->p_pic );
         osd_SetMenuUpdate( p_osd, true );
         osd_SetMenuVisible( p_osd, true );
-        osd_SetKeyPressed( VLC_OBJECT(p_osd->p_libvlc), config_GetInt( p_osd, p_button->psz_action ) );
+        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)", config_GetInt( p_osd, p_button->psz_action ), p_button->psz_action );
+        msg_Dbg( p_osd, "select (%d, %s)",
+                 var_InheritInteger( p_osd, p_button->psz_action ),
+                 p_button->psz_action );
 #endif
     }
-    vlc_mutex_unlock( lockval.p_address );
+    vlc_mutex_unlock( p_lock );
 }
 
-void __osd_MenuNext( vlc_object_t *p_this )
+#undef osd_MenuNext
+void osd_MenuNext( vlc_object_t *p_this )
 {
     osd_menu_t *p_osd;
     osd_button_t *p_button = NULL;
-    vlc_value_t lockval;
+    vlc_mutex_t *p_lock = osd_GetMutex( p_this );
 
-    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
-    vlc_mutex_lock( lockval.p_address );
+    vlc_mutex_lock( p_lock );
 
     p_osd = osd_Find( p_this );
     if( p_osd == NULL || !osd_isVisible( p_osd ) )
     {
-        vlc_mutex_unlock( lockval.p_address );
+        vlc_mutex_unlock( p_lock );
         msg_Err( p_this, "osd_MenuNext failed" );
         return;
     }
@@ -438,21 +448,21 @@ void __osd_MenuNext( vlc_object_t *p_this )
     msg_Dbg( p_osd, "direction right [button %s]", p_osd->p_state->p_visible->psz_action );
 #endif
 
-    vlc_mutex_unlock( lockval.p_address );
+    vlc_mutex_unlock( p_lock );
 }
 
-void __osd_MenuPrev( vlc_object_t *p_this )
+#undef osd_MenuPrev
+void osd_MenuPrev( vlc_object_t *p_this )
 {
     osd_menu_t *p_osd;
     osd_button_t *p_button = NULL;
-    vlc_value_t lockval;
+    vlc_mutex_t *p_lock = osd_GetMutex( p_this );
 
-    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
-    vlc_mutex_lock( lockval.p_address );
+    vlc_mutex_lock( p_lock );
     p_osd = osd_Find( p_this );
     if( p_osd == NULL || !osd_isVisible( p_osd ) )
     {
-        vlc_mutex_unlock( lockval.p_address );
+        vlc_mutex_unlock( p_lock );
         msg_Err( p_this, "osd_MenuPrev failed" );
         return;
     }
@@ -482,24 +492,24 @@ void __osd_MenuPrev( vlc_object_t *p_this )
     msg_Dbg( p_osd, "direction left [button %s]", p_osd->p_state->p_visible->psz_action );
 #endif
 
-    vlc_mutex_unlock( lockval.p_address );
+    vlc_mutex_unlock( p_lock );
 }
 
-void __osd_MenuUp( vlc_object_t *p_this )
+#undef osd_MenuUp
+void osd_MenuUp( vlc_object_t *p_this )
 {
     osd_menu_t *p_osd;
     osd_button_t *p_button = NULL;
-    vlc_value_t lockval;
 #if defined(OSD_MENU_DEBUG)
     vlc_value_t val;
 #endif
+    vlc_mutex_t *p_lock = osd_GetMutex( p_this );
 
-    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
-    vlc_mutex_lock( lockval.p_address );
+    vlc_mutex_lock( p_lock );
     p_osd = osd_Find( p_this );
     if( p_osd == NULL || !osd_isVisible( p_osd ) )
     {
-        vlc_mutex_unlock( lockval.p_address );
+        vlc_mutex_unlock( p_lock );
         msg_Err( p_this, "osd_MenuActivate failed" );
         return;
     }
@@ -537,7 +547,8 @@ void __osd_MenuUp( vlc_object_t *p_this )
             */
         if( p_button->b_range )
         {
-            osd_SetKeyPressed( VLC_OBJECT(p_osd->p_libvlc), config_GetInt(p_osd, p_button->psz_action) );
+            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 );
 #endif
@@ -547,25 +558,25 @@ void __osd_MenuUp( vlc_object_t *p_this )
     msg_Dbg( p_osd, "direction up [button %s]", p_osd->p_state->p_visible->psz_action );
 #endif
 
-    vlc_mutex_unlock( lockval.p_address );
+    vlc_mutex_unlock( p_lock );
 }
 
-void __osd_MenuDown( vlc_object_t *p_this )
+#undef osd_MenuDown
+void osd_MenuDown( vlc_object_t *p_this )
 {
     osd_menu_t *p_osd;
     osd_button_t *p_button = NULL;
-    vlc_value_t lockval;
 #if defined(OSD_MENU_DEBUG)
     vlc_value_t val;
 #endif
+    vlc_mutex_t *p_lock = osd_GetMutex( p_this );
 
-    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
-    vlc_mutex_lock( lockval.p_address );
+    vlc_mutex_lock( p_lock );
 
     p_osd = osd_Find( p_this );
     if( p_osd == NULL || !osd_isVisible( p_osd ) )
     {
-        vlc_mutex_unlock( lockval.p_address );
+        vlc_mutex_unlock( p_lock );
         msg_Err( p_this, "osd_MenuActivate failed" );
         return;
     }
@@ -603,7 +614,8 @@ void __osd_MenuDown( vlc_object_t *p_this )
          */
         if( p_button->b_range )
         {
-            osd_SetKeyPressed( VLC_OBJECT(p_osd->p_libvlc), config_GetInt(p_osd, p_button->psz_action_down) );
+            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 );
 #endif
@@ -613,7 +625,7 @@ void __osd_MenuDown( vlc_object_t *p_this )
     msg_Dbg( p_osd, "direction down [button %s]", p_osd->p_state->p_visible->psz_action );
 #endif
 
-    vlc_mutex_unlock( lockval.p_address );
+    vlc_mutex_unlock( p_lock );
 }
 
 static int osd_VolumeStep( vlc_object_t *p_this, int i_volume, int i_steps )
@@ -625,27 +637,27 @@ static int osd_VolumeStep( vlc_object_t *p_this, int i_volume, int i_steps )
     return (i_volume/i_volume_step);
 }
 
+#undef osd_Volume
 /**
  * Display current audio volume bitmap
  *
  * The OSD Menu audio volume bar is updated to reflect the new audio volume. Call this function
  * when the audio volume is updated outside the OSD menu command "menu up", "menu down" or "menu select".
  */
-void __osd_Volume( vlc_object_t *p_this )
+void osd_Volume( vlc_object_t *p_this )
 {
     osd_menu_t *p_osd;
     osd_button_t *p_button = NULL;
-    vlc_value_t lockval;
+    vlc_mutex_t *p_lock = osd_GetMutex( p_this );
     int i_volume = 0;
     int i_steps = 0;
 
-    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
-    vlc_mutex_lock( lockval.p_address );
+    vlc_mutex_lock( p_lock );
 
     p_osd = osd_Find( p_this );
     if( p_osd == NULL )
     {
-        vlc_mutex_unlock( lockval.p_address );
+        vlc_mutex_unlock( p_lock );
         msg_Err( p_this, "OSD menu volume update failed" );
         return;
     }
@@ -672,24 +684,24 @@ void __osd_Volume( vlc_object_t *p_this )
             osd_SetMenuVisible( p_osd, true );
         }
     }
-    vlc_mutex_unlock( lockval.p_address );
+    vlc_mutex_unlock( p_lock );
 }
 
-osd_button_t *__osd_ButtonFind( vlc_object_t *p_this, int i_x, int i_y,
+#undef osd_ButtonFind
+osd_button_t *osd_ButtonFind( vlc_object_t *p_this, int i_x, int i_y,
     int i_window_height, int i_window_width,
     int i_scale_width, int i_scale_height )
 {
     osd_menu_t *p_osd;
     osd_button_t *p_button;
-    vlc_value_t lockval;
+    vlc_mutex_t *p_lock = osd_GetMutex( p_this );
 
-    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
-    vlc_mutex_lock( lockval.p_address );
+    vlc_mutex_lock( p_lock );
 
     p_osd = osd_Find( p_this );
     if( p_osd == NULL || !osd_isVisible( p_osd ) )
     {
-        vlc_mutex_unlock( lockval.p_address );
+        vlc_mutex_unlock( p_lock );
         msg_Err( p_this, "osd_ButtonFind failed" );
         return NULL;
     }
@@ -740,31 +752,31 @@ osd_button_t *__osd_ButtonFind( vlc_object_t *p_this, int i_x, int i_y,
         if( ( i_x >= i_x_offset ) && ( i_x <= i_x_offset + i_width ) &&
             ( i_y >= i_y_offset ) && ( i_y <= i_y_offset + i_height ) )
         {
-            vlc_mutex_unlock( lockval.p_address );
+            vlc_mutex_unlock( p_lock );
             return p_button;
         }
     }
 
-    vlc_mutex_unlock( lockval.p_address );
+    vlc_mutex_unlock( p_lock );
     return NULL;
 }
 
+#undef osd_ButtonSelect
 /**
  * Select the button provided as the new active button
  */
-void __osd_ButtonSelect( vlc_object_t *p_this, osd_button_t *p_button )
+void osd_ButtonSelect( vlc_object_t *p_this, osd_button_t *p_button )
 {
     osd_menu_t *p_osd;
     osd_button_t *p_old;
-    vlc_value_t lockval;
+    vlc_mutex_t *p_lock = osd_GetMutex( p_this );
 
-    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
-    vlc_mutex_lock( lockval.p_address );
+    vlc_mutex_lock( p_lock );
 
     p_osd = osd_Find( p_this );
     if( p_osd == NULL || !osd_isVisible( p_osd ) )
     {
-        vlc_mutex_unlock( lockval.p_address );
+        vlc_mutex_unlock( p_lock );
         msg_Err( p_this, "osd_ButtonSelect failed" );
         return;
     }
@@ -791,5 +803,5 @@ void __osd_ButtonSelect( vlc_object_t *p_this, osd_button_t *p_button )
     msg_Dbg( p_osd, "button selected is [button %s]", p_osd->p_state->p_visible->psz_action );
 #endif
 
-    vlc_mutex_unlock( lockval.p_address );
+    vlc_mutex_unlock( p_lock );
 }