Commit 87ce9b02 authored by Rémi Duraffort's avatar Rémi Duraffort

dvdnav: use the right type of the vout object.

parent fd463225
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <vlc_charset.h> #include <vlc_charset.h>
#include <vlc_fs.h> #include <vlc_fs.h>
#include <vlc_url.h> #include <vlc_url.h>
#include <vlc_vout.h>
#include <vlc_dialog.h> #include <vlc_dialog.h>
...@@ -129,7 +130,7 @@ struct demux_sys_t ...@@ -129,7 +130,7 @@ struct demux_sys_t
input_thread_t *p_input; input_thread_t *p_input;
/* event */ /* event */
vlc_object_t *p_vout; vout_thread_t *p_vout;
/* palette for menus */ /* palette for menus */
uint32_t clut[16]; uint32_t clut[16];
...@@ -1425,22 +1426,18 @@ static int EventIntf( vlc_object_t *p_input, char const *psz_var, ...@@ -1425,22 +1426,18 @@ static int EventIntf( vlc_object_t *p_input, char const *psz_var,
if (val.i_int == INPUT_EVENT_VOUT) if (val.i_int == INPUT_EVENT_VOUT)
{ {
vlc_object_t *p_vout; if( p_sys->p_vout != NULL )
p_vout = p_sys->p_vout;
if( p_vout != NULL )
{ {
var_DelCallback( p_vout, "mouse-moved", EventMouse, p_demux ); var_DelCallback( p_sys->p_vout, "mouse-moved", EventMouse, p_demux );
var_DelCallback( p_vout, "mouse-clicked", EventMouse, p_demux ); var_DelCallback( p_sys->p_vout, "mouse-clicked", EventMouse, p_demux );
vlc_object_release( p_vout ); vlc_object_release( p_sys->p_vout );
} }
p_vout = (vlc_object_t *)input_GetVout( (input_thread_t *)p_input ); p_sys->p_vout = input_GetVout( (input_thread_t *)p_input );
p_sys->p_vout = p_vout; if( p_sys->p_vout != NULL )
if( p_vout != NULL )
{ {
var_AddCallback( p_vout, "mouse-moved", EventMouse, p_demux ); var_AddCallback( p_sys->p_vout, "mouse-moved", EventMouse, p_demux );
var_AddCallback( p_vout, "mouse-clicked", EventMouse, p_demux ); var_AddCallback( p_sys->p_vout, "mouse-clicked", EventMouse, p_demux );
} }
} }
(void) psz_var; (void) oldval; (void) psz_var; (void) oldval;
......
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