Commit 0cc1e189 authored by Thomas Guillem's avatar Thomas Guillem

vout: don't inherit viewpoint

And don't trigger viewpoint manually. This variable must be triggered only by
the owner of the viewpoint address (the input) in order to ensure the atomicity
of the struct.
parent 2a16691a
......@@ -562,11 +562,9 @@ static void VoutGetDisplayCfg(vout_thread_t *vout, vout_display_cfg_t *cfg, cons
/* Load configuration */
cfg->is_fullscreen = var_GetBool(vout, "fullscreen")
|| var_GetBool(vout, "video-wallpaper");
const vlc_viewpoint_t *p_viewpoint = var_GetAddress(vout, "viewpoint");
if (p_viewpoint != NULL)
cfg->viewpoint = *p_viewpoint;
else
cfg->viewpoint = vout->p->original.pose;
cfg->viewpoint = vout->p->original.pose;
cfg->display.title = title;
const int display_width = var_GetInteger(vout, "width");
const int display_height = var_GetInteger(vout, "height");
......
......@@ -301,7 +301,7 @@ void vout_IntfInit( vout_thread_t *p_vout )
var_Create( p_vout, "mouse-clicked", VLC_VAR_COORDS );
/* Viewpoint */
var_Create( p_vout, "viewpoint", VLC_VAR_ADDRESS | VLC_VAR_DOINHERIT );
var_Create( p_vout, "viewpoint", VLC_VAR_ADDRESS );
var_AddCallback( p_vout, "viewpoint", ViewpointCallback, NULL );
var_Create( p_vout, "viewpoint-changeable", VLC_VAR_BOOL );
......@@ -321,7 +321,6 @@ void vout_IntfReinit( vout_thread_t *p_vout )
var_TriggerCallback( p_vout, "sub-source" );
var_TriggerCallback( p_vout, "sub-filter" );
var_TriggerCallback( p_vout, "sub-margin" );
var_TriggerCallback( p_vout, "viewpoint" );
}
/*****************************************************************************
......
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