Skip to content

V
vlc-2-2
Commit af279394 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Do not reuse "osd" variable in osd menu.

parent daa556bc
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
src/osd/osd.c
View file @ af279394
...@@ -153,8 +153,8 @@ osd_menu_t *osd_MenuCreate( vlc_object_t *p_this, const char *psz_file ) ...@@ -153,8 +153,8 @@ osd_menu_t *osd_MenuCreate( vlc_object_t *p_this, const char *psz_file )
p_lock = osd_GetMutex( p_this ); p_lock = osd_GetMutex( p_this );
vlc_mutex_lock( p_lock ); vlc_mutex_lock( p_lock );
var_Create( p_this->p_libvlc, "osd", VLC_VAR_ADDRESS ); var_Create( p_this->p_libvlc, "osd-object", VLC_VAR_ADDRESS );
var_Get( p_this->p_libvlc, "osd", &val ); var_Get( p_this->p_libvlc, "osd-object", &val );
if( val.p_address == NULL ) if( val.p_address == NULL )
{ {
static const char osdmenu_name[] = "osd menu"; static const char osdmenu_name[] = "osd menu";
...@@ -200,7 +200,7 @@ osd_menu_t *osd_MenuCreate( vlc_object_t *p_this, const char *psz_file ) ...@@ -200,7 +200,7 @@ osd_menu_t *osd_MenuCreate( vlc_object_t *p_this, const char *psz_file )
var_SetBool( p_osd, "osd-menu-visible", false ); var_SetBool( p_osd, "osd-menu-visible", false );
val.p_address = p_osd; val.p_address = p_osd;
var_Set( p_this->p_libvlc, "osd", val ); var_Set( p_this->p_libvlc, "osd-object", val );
} }
else else
p_osd = val.p_address; p_osd = val.p_address;
...@@ -232,7 +232,7 @@ void osd_MenuDelete( vlc_object_t *p_this, osd_menu_t *p_osd ) ...@@ -232,7 +232,7 @@ void osd_MenuDelete( vlc_object_t *p_this, osd_menu_t *p_osd )
var_Destroy( p_osd, "osd-menu-update" ); var_Destroy( p_osd, "osd-menu-update" );
osd_ParserUnload( p_osd ); osd_ParserUnload( p_osd );
val.p_address = NULL; 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 ); vlc_object_release( p_osd );
...@@ -243,7 +243,7 @@ static osd_menu_t *osd_Find( vlc_object_t *p_this ) ...@@ -243,7 +243,7 @@ static osd_menu_t *osd_Find( vlc_object_t *p_this )
{ {
vlc_value_t val; 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 NULL;
return val.p_address; return val.p_address;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment