Updated osdmenu to new sub-filter mouse API.

modules/video_filter/osdmenu.c

@@ -30,7 +30,6 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout.h>
 #include <vlc_filter.h>
 
 #include <vlc_osd.h>
@@ -97,8 +96,10 @@ static int OSDMenuVisibleEvent( vlc_object_t *, char const *,
 static int OSDMenuCallback( vlc_object_t *, char const *,
                             vlc_value_t, vlc_value_t, void * );
 
-static int MouseEvent( vlc_object_t *, char const *,
-                        vlc_value_t , vlc_value_t , void * );
+static int MouseEvent( filter_t *,
+                       const vlc_mouse_t *,
+                       const vlc_mouse_t *,
+                       const video_format_t * );
 
 #define OSD_CFG "osdmenu-"
 
@@ -169,7 +170,6 @@ struct filter_sys_t
     osd_menu_t  *p_menu;        /* pointer to OSD Menu object */
 
     /* menu interaction */
-    vout_thread_t *p_vout;
     bool  b_clicked;
     uint32_t    i_mouse_x;
     uint32_t    i_mouse_y;
@@ -252,11 +252,7 @@ static int CreateFilter ( vlc_object_t *p_this )
 
     /* Attach subpicture filter callback */
     p_filter->pf_sub_filter = Filter;
-
-    p_sys->p_vout = vlc_object_find( p_this, VLC_OBJECT_VOUT, FIND_PARENT );
-    if( p_sys->p_vout )
-        var_AddCallback( p_sys->p_vout, "mouse-clicked",
-                        MouseEvent, p_sys );
+    p_filter->pf_sub_mouse  = MouseEvent;
 
     es_format_Init( &p_filter->fmt_out, SPU_ES, VLC_CODEC_SPU );
     p_filter->fmt_out.i_priority = 0;
@@ -290,13 +286,6 @@ static void DestroyFilter( vlc_object_t *p_this )
     var_DelCallback( p_sys->p_menu, "osd-menu-visible",
                      OSDMenuVisibleEvent, p_filter );
 
-    if( p_sys->p_vout )
-    {
-        var_DelCallback( p_sys->p_vout, "mouse-clicked",
-                        MouseEvent, p_sys );
-        vlc_object_release( p_sys->p_vout );
-    }
-
     var_Destroy( p_this, OSD_CFG "file-path" );
     var_Destroy( p_this, OSD_CFG "file" );
     var_Destroy( p_this, OSD_CFG "x" );
@@ -486,7 +475,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t i_date )
         return p_spu;
     }
 
-    if( p_sys->p_vout && p_sys->b_clicked )
+    if( p_sys->b_clicked )
     {
         p_sys->b_clicked = false;
         osd_MenuActivate( p_filter );
@@ -624,43 +613,28 @@ static int OSDMenuCallback( vlc_object_t *p_this, char const *psz_var,
     return VLC_SUCCESS;
 }
 
-/*****************************************************************************
- * MouseEvent: callback for mouse events
- *****************************************************************************/
-static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
-                       vlc_value_t oldval, vlc_value_t newval, void *p_data )
+static int MouseEvent( filter_t *p_filter,
+                       const vlc_mouse_t *p_old,
+                       const vlc_mouse_t *p_new,
+                       const video_format_t *p_fmt )
 {
-    VLC_UNUSED(oldval);
-    filter_sys_t *p_sys = (filter_sys_t *)p_data;
-    vout_thread_t *p_vout = (vout_thread_t*)p_sys->p_vout;
-    int i_x = newval.coords.x;
-    int i_y = newval.coords.y;
-    int v_h = p_vout->fmt_out.i_height;
-    int v_w = p_vout->fmt_out.i_width;
-
-    if( i_y < 0 || i_x < 0 || i_y >= v_h || i_x >= v_w )
-        return VLC_SUCCESS;
+    filter_sys_t *p_sys = p_filter->p_sys;
 
-    do
-    {
-        int i_scale_width, i_scale_height;
-        osd_button_t *p_button = NULL;
+    if( !vlc_mouse_HasPressed( p_old, p_new, MOUSE_BUTTON_LEFT ) )
+        return VLC_SUCCESS;
 
-        i_scale_width = p_vout->fmt_out.i_visible_width * 1000 /
-            p_vout->fmt_in.i_visible_width;
-        i_scale_height = p_vout->fmt_out.i_visible_height * 1000 /
-            p_vout->fmt_in.i_visible_height;
+    osd_button_t *p_button = osd_ButtonFind( VLC_OBJECT(p_filter),
+                                             p_new->i_x,
+                                             p_new->i_y,
+                                             p_fmt->i_width,
+                                             p_fmt->i_height,
+                                             1000, 1000 );
+    if( !p_button )
+        return VLC_SUCCESS;
 
-        p_button = osd_ButtonFind( p_this, i_x, i_y, v_h, v_w,
-                                   i_scale_width, i_scale_height );
-        if( p_button )
-        {
-            osd_ButtonSelect( p_this, p_button );
-            p_sys->b_update = p_sys->b_visible ? true : false;
-            p_sys->b_clicked = true;
-            msg_Dbg( p_this, "mouse clicked %s (%d,%d)", p_button->psz_name, i_x, i_y );
-        }
-    }
-    while(0);
+    osd_ButtonSelect( VLC_OBJECT(p_filter), p_button );
+    p_sys->b_update = p_sys->b_visible ? true : false;
+    p_sys->b_clicked = true;
+    msg_Dbg( p_filter, "mouse clicked %s (%d,%d)", p_button->psz_name, p_new->i_x, p_new->i_y );
     return VLC_SUCCESS;
 }