[vlc-devel] [vlc-commits] commit: dvdnav: use the right type of the vout object. ( Rémi Duraffort )
Laurent Aimar
fenrir at elivagar.org
Fri Dec 3 18:09:41 CET 2010
On Fri, Dec 03, 2010 at 12:38:26PM +0100, git at videolan.org wrote:
> vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Fri Dec 3 12:38:01 2010 +0100| [87ce9b02935fdcb29c0307b551b3bbf9a28fc2c3] | committer: Rémi Duraffort
>
> dvdnav: use the right type of the vout object.
>
> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=87ce9b02935fdcb29c0307b551b3bbf9a28fc2c3
> ---
>
> @@ -129,7 +130,7 @@ struct demux_sys_t
> input_thread_t *p_input;
>
> /* event */
> - vlc_object_t *p_vout;
> + vout_thread_t *p_vout;
Which is not right. vlc_object_t is somehow the public interface
while vout_thread_t is a private interface that you can use when it is
given so by someone.
> @@ -1425,22 +1426,18 @@ static int EventIntf( vlc_object_t *p_input, char const *psz_var,
>
> if (val.i_int == INPUT_EVENT_VOUT)
> {
> - vlc_object_t *p_vout;
> -
> - p_vout = p_sys->p_vout;
> - if( p_vout != NULL )
> + if( p_sys->p_vout != NULL )
> {
> - var_DelCallback( p_vout, "mouse-moved", EventMouse, p_demux );
> - var_DelCallback( p_vout, "mouse-clicked", EventMouse, p_demux );
> - vlc_object_release( p_vout );
> + var_DelCallback( p_sys->p_vout, "mouse-moved", EventMouse, p_demux );
> + var_DelCallback( p_sys->p_vout, "mouse-clicked", EventMouse, p_demux );
> + vlc_object_release( p_sys->p_vout );
> }
>
> - p_vout = (vlc_object_t *)input_GetVout( (input_thread_t *)p_input );
> - p_sys->p_vout = p_vout;
> - if( p_vout != NULL )
> + p_sys->p_vout = input_GetVout( (input_thread_t *)p_input );
> + if( p_sys->p_vout != NULL )
> {
> - var_AddCallback( p_vout, "mouse-moved", EventMouse, p_demux );
> - var_AddCallback( p_vout, "mouse-clicked", EventMouse, p_demux );
> + var_AddCallback( p_sys->p_vout, "mouse-moved", EventMouse, p_demux );
> + var_AddCallback( p_sys->p_vout, "mouse-clicked", EventMouse, p_demux );
> }
Cosmetics that should have been committed separately (and I don't see the point).
Regards,
--
fenrir
More information about the vlc-devel
mailing list