* src/video_output/*: moved some stuff from video_output.c to vout_intf.c.
static inline int GetAlignedSize( int );
+static int SendEvents( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
p_vout->pf_display = DisplayVideo;
p_vout->pf_control = Control;
+ /* Forward events from the opengl provider */
+ var_AddCallback( p_sys->p_vout, "mouse-x", SendEvents, p_vout );
+ var_AddCallback( p_sys->p_vout, "mouse-y", SendEvents, p_vout );
+ var_AddCallback( p_sys->p_vout, "mouse-moved", SendEvents, p_vout );
+ var_AddCallback( p_sys->p_vout, "mouse-clicked", SendEvents, p_vout );
+
return VLC_SUCCESS;
}
else
return vout_vaControlDefault( p_vout, i_query, args );
}
+
+/*****************************************************************************
+ * SendEvents: forward mouse and keyboard events to the parent p_vout
+ *****************************************************************************/
+static int SendEvents( vlc_object_t *p_this, char const *psz_var,
+ vlc_value_t oldval, vlc_value_t newval, void *_p_vout )
+{
+ return var_Set( (vlc_object_t *)_p_vout, psz_var, newval );
+}
p_vout->pf_control = 0;
p_vout->p_parent_intf = 0;
- /* Mouse coordinates */
- var_Create( p_vout, "mouse-x", VLC_VAR_INTEGER );
- var_Create( p_vout, "mouse-y", VLC_VAR_INTEGER );
- var_Create( p_vout, "mouse-button-down", VLC_VAR_INTEGER );
- var_Create( p_vout, "mouse-moved", VLC_VAR_BOOL );
- var_Create( p_vout, "mouse-clicked", VLC_VAR_INTEGER );
-
- var_Create( p_vout, "intf-change", VLC_VAR_BOOL );
- val.b_bool = VLC_TRUE;
- var_Set( p_vout, "intf-change", val );
-
/* Initialize locks */
vlc_mutex_init( p_vout, &p_vout->picture_lock );
vlc_mutex_init( p_vout, &p_vout->subpicture_lock );
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
}
var_AddCallback( p_vout, "fullscreen", FullscreenCallback, NULL );
+
+ /* Mouse coordinates */
+ var_Create( p_vout, "mouse-x", VLC_VAR_INTEGER );
+ var_Create( p_vout, "mouse-y", VLC_VAR_INTEGER );
+ var_Create( p_vout, "mouse-button-down", VLC_VAR_INTEGER );
+ var_Create( p_vout, "mouse-moved", VLC_VAR_BOOL );
+ var_Create( p_vout, "mouse-clicked", VLC_VAR_INTEGER );
+
+ var_Create( p_vout, "intf-change", VLC_VAR_BOOL );
+ val.b_bool = VLC_TRUE;
+ var_Set( p_vout, "intf-change", val );
}
/*****************************************************************************