summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
37a27cc)
This removes a dangerous vlc_object_find(PARENT) and potentially
invalids var_DelCallback().
It also avoids useless callback destructions and so fixes some dvd menus.
*/
typedef struct {
vout_thread_t *vout;
*/
typedef struct {
vout_thread_t *vout;
const video_format_t *fmt;
} vout_configuration_t;
const video_format_t *fmt;
} vout_configuration_t;
aout_instance_t *p_aout = p_private;
VLC_UNUSED(b_recycle);
vout_configuration_t cfg = {
aout_instance_t *p_aout = p_private;
VLC_UNUSED(b_recycle);
vout_configuration_t cfg = {
- .vout = p_vout,
- .fmt = p_fmt,
+ .vout = p_vout,
+ .input = NULL,
+ .fmt = p_fmt,
};
return vout_Request( p_aout, &cfg );
}
};
return vout_Request( p_aout, &cfg );
}
/* */
vout_configuration_t cfg = {
/* */
vout_configuration_t cfg = {
- .vout = p_vout,
- .fmt = p_fmt,
+ .vout = p_vout,
+ .input = VLC_OBJECT(p_resource->p_input),
+ .fmt = p_fmt,
};
p_vout = vout_Request( p_resource->p_input, &cfg );
if( !p_vout )
};
p_vout = vout_Request( p_resource->p_input, &cfg );
if( !p_vout )
vout_Flush( p_vout, 1 );
vout_FlushSubpictureChannel( p_vout, -1 );
vout_Flush( p_vout, 1 );
vout_FlushSubpictureChannel( p_vout, -1 );
- p_resource->p_vout_free = p_vout;
+ vout_configuration_t cfg = {
+ .vout = p_vout,
+ .input = NULL,
+ .fmt = p_fmt,
+ };
+ p_resource->p_vout_free = vout_Request( p_resource->p_input, &cfg );
vlc_object_release(vout);
return NULL;
}
vlc_object_release(vout);
return NULL;
}
- spu_Attach(vout->p->p_spu, VLC_OBJECT(vout), true);
vout_control_WaitEmpty(&vout->p->control);
vout_control_WaitEmpty(&vout->p->control);
+ vout->p->input = cfg->input;
+ if (vout->p->input)
+ spu_Attach(vout->p->p_spu, vout->p->input, true);
+
/* If a vout is provided, try reusing it */
if (vout) {
/* If a vout is provided, try reusing it */
if (vout) {
- spu_Attach(vout->p->p_spu, VLC_OBJECT(vout), false);
vlc_object_detach(vout);
vlc_object_attach(vout, object);
vlc_object_detach(vout);
vlc_object_attach(vout, object);
- spu_Attach(vout->p->p_spu, VLC_OBJECT(vout), true);
+
+ if (vout->p->input != cfg->input) {
+ if (vout->p->input)
+ spu_Attach(vout->p->p_spu, vout->p->input, false);
+ vout->p->input = cfg->input;
+ if (vout->p->input)
+ spu_Attach(vout->p->p_spu, vout->p->input, true);
+ }
vout_control_cmd_t cmd;
vout_control_cmd_Init(&cmd, VOUT_CONTROL_REINIT);
vout_control_cmd_t cmd;
vout_control_cmd_Init(&cmd, VOUT_CONTROL_REINIT);
- spu_Attach(vout->p->p_spu, VLC_OBJECT(vout), false);
+ if (vout->p->input)
+ spu_Attach(vout->p->p_spu, vout->p->input, false);
vlc_object_detach(vout->p->p_spu);
vout_snapshot_End(&vout->p->snapshot);
vlc_object_detach(vout->p->p_spu);
vout_snapshot_End(&vout->p->snapshot);
/* Splitter module if used */
char *splitter_name;
/* Splitter module if used */
char *splitter_name;
+ /* Input thread for dvd menu interactions */
+ vlc_object_t *input;
+
- video_format_t original; /* Original format ie coming from the decoder */
+ video_format_t original; /* Original format ie coming from the decoder */
/* Snapshot interface */
vout_snapshot_t snapshot;
/* Snapshot interface */
vout_snapshot_t snapshot;
/* */
int spu_ProcessMouse(spu_t *, const vlc_mouse_t *, const video_format_t *);
/* */
int spu_ProcessMouse(spu_t *, const vlc_mouse_t *, const video_format_t *);
-void spu_Attach( spu_t *, vlc_object_t *, bool );
+void spu_Attach( spu_t *, vlc_object_t *input, bool );
* \param p_this the object in which to destroy the subpicture unit
* \param b_attach to select attach or detach
*/
* \param p_this the object in which to destroy the subpicture unit
* \param b_attach to select attach or detach
*/
-void spu_Attach( spu_t *p_spu, vlc_object_t *p_this, bool b_attach )
+void spu_Attach( spu_t *p_spu, vlc_object_t *p_input, bool b_attach )
- vlc_object_t *p_input;
-
- p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_PARENT );
- if( !p_input )
- return;
-
if( b_attach )
{
UpdateSPU( p_spu, VLC_OBJECT(p_input) );
if( b_attach )
{
UpdateSPU( p_spu, VLC_OBJECT(p_input) );
vlc_mutex_lock( &p_spu->p->lock );
p_spu->p->i_margin = var_GetInteger( p_input, "sub-margin" );
vlc_mutex_unlock( &p_spu->p->lock );
vlc_mutex_lock( &p_spu->p->lock );
p_spu->p->i_margin = var_GetInteger( p_input, "sub-margin" );
vlc_mutex_unlock( &p_spu->p->lock );
-
- vlc_object_release( p_input );
var_DelCallback( p_input, "sub-margin", MarginCallback, p_spu->p );
var_DelCallback( p_input, "highlight", CropCallback, p_spu );
var_Destroy( p_input, "highlight" );
var_DelCallback( p_input, "sub-margin", MarginCallback, p_spu->p );
var_DelCallback( p_input, "highlight", CropCallback, p_spu );
var_Destroy( p_input, "highlight" );
- vlc_object_release( p_input );