Commit f1cde45f authored by Jean-Paul Saman's avatar Jean-Paul Saman

logo: "mouse-object" is attached to vout not filter->parent.

Signed-off-by: Jean-Paul Saman's avatarJean-Paul Saman <jean-paul.saman@m2x.nl>
parent 744486e5
/***************************************************************************** /*****************************************************************************
* logo.c : logo video plugin for vlc * logo.c : logo video plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2003-2006 the VideoLAN team * Copyright (C) 2003-2010 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Gildas Bazin <gbazin@videolan.org> * Authors: Gildas Bazin <gbazin@videolan.org>
...@@ -534,13 +534,17 @@ static int Mouse( filter_t *p_filter, vlc_mouse_t *p_mouse, ...@@ -534,13 +534,17 @@ static int Mouse( filter_t *p_filter, vlc_mouse_t *p_mouse,
p_sys->i_pos_y = __MIN( __MAX( p_sys->i_pos_y + i_dy, 0 ), p_sys->i_pos_y = __MIN( __MAX( p_sys->i_pos_y + i_dy, 0 ),
p_filter->fmt_in.video.i_height - i_logo_h ); p_filter->fmt_in.video.i_height - i_logo_h );
/* object under mouse has moved */
var_SetBool( p_filter->p_parent, "mouse-object", true );
} }
else if( b_over )
/* mouse-object: area of interest */
if( b_over )
{
vout_thread_t *p_vout = vlc_object_find( p_filter, VLC_OBJECT_VOUT, FIND_ANYWHERE );
if( p_vout )
{ {
/* object under mouse stoped moving */ var_SetBool( p_vout, "mouse-object", p_sys->b_mouse_grab );
var_SetBool( p_filter->p_parent, "mouse-object", false ); vlc_object_release( p_vout );
}
} }
if( p_sys->b_mouse_grab || b_over ) if( p_sys->b_mouse_grab || b_over )
......
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