Commit 6bd7c460 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

vout: use var_Inherit*() for video-title* variables

parent f7a9144d
...@@ -77,7 +77,6 @@ int CommonInit(vout_display_t *vd) ...@@ -77,7 +77,6 @@ int CommonInit(vout_display_t *vd)
sys->is_first_display = true; sys->is_first_display = true;
sys->is_on_top = false; sys->is_on_top = false;
var_Create(vd, "video-title", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
var_Create(vd, "video-deco", VLC_VAR_BOOL | VLC_VAR_DOINHERIT); var_Create(vd, "video-deco", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
/* */ /* */
......
...@@ -957,7 +957,7 @@ void EventThreadMouseHide( event_thread_t *p_event ) ...@@ -957,7 +957,7 @@ void EventThreadMouseHide( event_thread_t *p_event )
void EventThreadUpdateTitle( event_thread_t *p_event, const char *psz_fallback ) void EventThreadUpdateTitle( event_thread_t *p_event, const char *psz_fallback )
{ {
char *psz_title = var_GetNonEmptyString( p_event->vd, "video-title" ); char *psz_title = var_InheritString( p_event->vd, "video-title" );
if( !psz_title ) if( !psz_title )
psz_title = strdup( psz_fallback ); psz_title = strdup( psz_fallback );
if( !psz_title ) if( !psz_title )
......
...@@ -149,9 +149,9 @@ static vout_thread_t *VoutCreate(vlc_object_t *object, ...@@ -149,9 +149,9 @@ static vout_thread_t *VoutCreate(vlc_object_t *object,
/* Take care of some "interface/control" related initialisations */ /* Take care of some "interface/control" related initialisations */
vout_IntfInit(vout); vout_IntfInit(vout);
vout->p->title.show = var_GetBool(vout, "video-title-show"); vout->p->title.show = var_InheritBool(vout, "video-title-show");
vout->p->title.timeout = var_GetInteger(vout, "video-title-timeout"); vout->p->title.timeout = var_InheritInteger(vout, "video-title-timeout");
vout->p->title.position = var_GetInteger(vout, "video-title-position"); vout->p->title.position = var_InheritInteger(vout, "video-title-position");
/* Get splitter name if present */ /* Get splitter name if present */
char *splitter_name = var_InheritString(vout, "video-splitter"); char *splitter_name = var_InheritString(vout, "video-splitter");
......
...@@ -162,10 +162,6 @@ void vout_IntfInit( vout_thread_t *p_vout ) ...@@ -162,10 +162,6 @@ void vout_IntfInit( vout_thread_t *p_vout )
var_Create( p_vout, "mouse-hide-timeout", var_Create( p_vout, "mouse-hide-timeout",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_vout, "video-title-show", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Create( p_vout, "video-title-timeout", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_vout, "video-title-position", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
/* Zoom object var */ /* Zoom object var */
var_Create( p_vout, "zoom", VLC_VAR_FLOAT | VLC_VAR_ISCOMMAND | var_Create( p_vout, "zoom", VLC_VAR_FLOAT | VLC_VAR_ISCOMMAND |
VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT ); VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT );
......
...@@ -54,7 +54,7 @@ int vout_OpenWrapper(vout_thread_t *vout, ...@@ -54,7 +54,7 @@ int vout_OpenWrapper(vout_thread_t *vout,
msg_Dbg(vout, "Opening vout display wrapper"); msg_Dbg(vout, "Opening vout display wrapper");
/* */ /* */
sys->display.title = var_CreateGetNonEmptyString(vout, "video-title"); sys->display.title = var_InheritString(vout, "video-title");
/* */ /* */
const mtime_t double_click_timeout = 300000; const mtime_t double_click_timeout = 300000;
......
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