Commit a3988310 authored by Laurent Aimar's avatar Laurent Aimar

Cosmetics (vout).

parent b874f1bf
......@@ -1414,8 +1414,8 @@ void vout_SendDisplayEventMouse(vout_thread_t *vout, const vlc_mouse_t *m)
return;
vlc_mutex_lock( &vout->p->vfilter_lock );
if (vout->p->p_vf2_chain) {
if (!filter_chain_MouseFilter(vout->p->p_vf2_chain, &tmp, m))
if (vout->p->vfilter_chain) {
if (!filter_chain_MouseFilter(vout->p->vfilter_chain, &tmp, m))
m = &tmp;
}
vlc_mutex_unlock( &vout->p->vfilter_lock );
......@@ -1452,7 +1452,7 @@ static void DummyVoutSendDisplayEventMouse(vout_thread_t *vout, vlc_mouse_t *fal
if (!vout->p) {
p.mouse = *fallback;
vlc_mutex_init(&p.vfilter_lock);
p.p_vf2_chain = NULL;
p.vfilter_chain = NULL;
p.p_spu = NULL;
vout->p = &p;
}
......
......@@ -245,8 +245,9 @@ vout_thread_t * (vout_Create)( vlc_object_t *p_parent, video_format_t *p_fmt )
vout_snapshot_Init( &p_vout->p->snapshot );
p_vout->p->p_vf2_chain = filter_chain_New( p_vout, "video filter2",
false, video_filter_buffer_allocation_init, NULL, p_vout );
p_vout->p->vfilter_chain =
filter_chain_New( p_vout, "video filter2", false,
video_filter_buffer_allocation_init, NULL, p_vout );
/* Initialize locks */
vlc_mutex_init( &p_vout->p->picture_lock );
......@@ -680,7 +681,7 @@ static int ThreadDisplayPicture(vout_thread_t *vout,
picture_t *filtered = NULL;
if (decoded) {
vlc_mutex_lock(&vout->p->vfilter_lock);
filtered = filter_chain_VideoFilter(vout->p->p_vf2_chain, decoded);
filtered = filter_chain_VideoFilter(vout->p->vfilter_chain, decoded);
//assert(filtered == decoded); // TODO implement
vlc_mutex_unlock(&vout->p->vfilter_lock);
if (!filtered)
......@@ -831,8 +832,8 @@ static void ThreadChangeFilters(vout_thread_t *vout, const char *filters)
vlc_mutex_lock(&vout->p->vfilter_lock);
filter_chain_Reset(vout->p->p_vf2_chain, &fmt, &fmt);
if (filter_chain_AppendFromString(vout->p->p_vf2_chain,
filter_chain_Reset(vout->p->vfilter_chain, &fmt, &fmt);
if (filter_chain_AppendFromString(vout->p->vfilter_chain,
filters) < 0)
msg_Err(vout, "Video filter chain creation failed");
......@@ -1168,7 +1169,7 @@ exit_thread:
vout_control_Dead(&vout->p->control);
/* Destroy the video filters2 */
filter_chain_Delete(vout->p->p_vf2_chain);
filter_chain_Delete(vout->p->vfilter_chain);
return NULL;
}
......
......@@ -105,7 +105,7 @@ struct vout_thread_sys_t
/* Video filter2 chain */
vlc_mutex_t vfilter_lock;
filter_chain_t *p_vf2_chain;
filter_chain_t *vfilter_chain;
/* Snapshot interface */
vout_snapshot_t snapshot;
......
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