* Install/remove all callbacks needed for proper event handling inside
* a vout-filter.
*/
-static inline void vout_filter_SetupChild( vout_thread_t *p_parent, vout_thread_t *p_child,
+static inline void vout_filter_SetupChild( vout_thread_t *p_parent,
+ vout_thread_t *p_child,
vlc_callback_t pf_mouse_event,
- vlc_callback_t pf_fullscreen_up,
vlc_callback_t pf_fullscreen_down,
bool b_init )
{
pf_execute( VLC_OBJECT(p_parent), "crop", ForwardEvent, p_child );
/* */
- if( !pf_fullscreen_up )
- pf_fullscreen_up = ForwardEvent;
if( !pf_fullscreen_down )
pf_fullscreen_down = ForwardEvent;
- pf_execute( VLC_OBJECT(p_child), "fullscreen", pf_fullscreen_up, p_parent );
pf_execute( VLC_OBJECT(p_parent), "fullscreen", pf_fullscreen_down, p_child );
}
-#define vout_filter_AddChild( a, b, c ) vout_filter_SetupChild( a, b, c, NULL, NULL, true )
-#define vout_filter_DelChild( a, b, c ) vout_filter_SetupChild( a, b, c, NULL, NULL, false )
+#define vout_filter_AddChild( a, b, c ) vout_filter_SetupChild( a, b, c, NULL, true )
+#define vout_filter_DelChild( a, b, c ) vout_filter_SetupChild( a, b, c, NULL, false )
static void FilterAllocationClean( filter_t * );
/* */
-static int FullscreenEventUp( vlc_object_t *, char const *,
- vlc_value_t, vlc_value_t, void * );
static int FullscreenEventDown( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static int SplitterPictureNew( video_splitter_t *, picture_t *pp_picture[] );
}
}
- /* Attach once pp_vout is completly field to avoid race conditions */
+ /* Attach once pp_vout is completly filed to avoid race conditions */
for( int i = 0; i < p_splitter->i_output; i++ )
vout_filter_SetupChild( p_vout, p_sys->pp_vout[i],
MouseEvent,
- FullscreenEventUp, FullscreenEventDown, true );
+ FullscreenEventDown, true );
/* Restore settings */
var_SetInteger( p_vout, "align", i_org_align );
var_SetInteger( p_vout, "video-x", i_org_x );
else
vout_filter_SetupChild( p_vout, p_sys->pp_vout[i],
MouseEvent,
- FullscreenEventUp, FullscreenEventDown, false );
+ FullscreenEventDown, false );
}
for( int i = 0; i < i_count; i++ )
}
return false;
}
-static int FullscreenEventUp( vlc_object_t *p_this, char const *psz_var,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
-{
- vout_thread_t *p_vout = p_data;
- VLC_UNUSED(oldval); VLC_UNUSED(p_this); VLC_UNUSED(psz_var); VLC_UNUSED(newval);
-
- const bool b_fullscreen = IsFullscreenActive( p_vout );
- return var_SetBool( p_vout, "fullscreen", b_fullscreen );
-}
static int FullscreenEventDown( vlc_object_t *p_this, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{