Make mouse-moved a void variable

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index be05431b9ee4378db6396136710c54439498cc55..d65dbbca7988d93ad2aae885475634cb109c71b4 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -668,9 +668,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
                             p_vout->render.i_height / i_height;
             }
             var_Set( p_vout, "mouse-y", val );
-
-            val.b_bool = true;
-            var_Set( p_vout, "mouse-moved", val );
+            var_TriggerCallback( p_vout, "mouse-moved" );
         }
         if( [self isFullscreen] )
             [[[[VLCMain sharedInstance] controls] fspanel] fadeIn];

diff --git a/modules/gui/macosx/voutgl.m b/modules/gui/macosx/voutgl.m
index abe1a321e639c83ebf0b6da6ddbbba7a62d61318..4a496cd53c37595cbfa5f574c85b880488142293 100644 (file)
--- a/modules/gui/macosx/voutgl.m
+++ b/modules/gui/macosx/voutgl.m
@@ -1030,10 +1030,7 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event
                             p_vout->render.i_height / i_height;
 
                 var_Set( p_vout, "mouse-y", val );
-
-                val.b_bool = true;
-                var_Set( p_vout, "mouse-moved", val );
-
+                var_TriggerCallback( p_vout, "mouse-moved" );
                 break;
             }
  

diff --git a/modules/gui/minimal_macosx/voutagl.m b/modules/gui/minimal_macosx/voutagl.m
index 80425c2bd606099e48d2a6177ca2f31e507dae75..58f457f2de68ed87967be13b31fde5db04a21d55 100644 (file)
--- a/modules/gui/minimal_macosx/voutagl.m
+++ b/modules/gui/minimal_macosx/voutagl.m
@@ -588,10 +588,7 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event
                             p_vout->render.i_height / i_height;
 
                 var_Set( p_vout, "mouse-y", val );
-
-                val.b_bool = true;
-                var_Set( p_vout, "mouse-moved", val );
-
+                var_TriggerCallback( p_vout, "mouse-moved" );
                 break;
             }
  

diff --git a/modules/video_filter/wrapper.c b/modules/video_filter/wrapper.c
index 928f4034b59ef7930bc703f907da12a95a9c0ef3..d01527fc880368d31477eef55e87226f529c004d 100644 (file)
--- a/modules/video_filter/wrapper.c
+++ b/modules/video_filter/wrapper.c
@@ -487,7 +487,7 @@ static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
     {
         var_SetInteger( p_vout, "mouse-x", nmouse.i_x );
         var_SetInteger( p_vout, "mouse-y", nmouse.i_y );
-        var_SetBool( p_vout, "mouse-moved", true );
+        var_TriggerCallback( p_vout, "mouse-moved" );
     }
     if( vlc_mouse_HasButton( &omouse, &nmouse ) )
     {

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index c1dfb444b54c361570820b5a93453148a04a984e..fa1d0486371d0264d9896f8d8939b214531ac9d0 100644 (file)
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -131,7 +131,7 @@ static int CreateVout( vlc_object_t *p_this )
     /* Forward events from the opengl provider */
     var_Create( p_sys->p_vout, "mouse-x", VLC_VAR_INTEGER );
     var_Create( p_sys->p_vout, "mouse-y", VLC_VAR_INTEGER );
-    var_Create( p_sys->p_vout, "mouse-moved", VLC_VAR_BOOL );
+    var_Create( p_sys->p_vout, "mouse-moved", VLC_VAR_VOID );
     var_Create( p_sys->p_vout, "mouse-clicked", VLC_VAR_BOOL );
     var_Create( p_sys->p_vout, "mouse-button-down", VLC_VAR_INTEGER );
     var_Create( p_sys->p_vout, "video-on-top",

diff --git a/src/video_output/event.h b/src/video_output/event.h
index bbc7812c4ae6cc466d8c9e4311e113f8fa26f40a..bf9087c1633538230f9b6b2ce0585a5631c9a12a 100644 (file)
--- a/src/video_output/event.h
+++ b/src/video_output/event.h
@@ -58,7 +58,7 @@ static inline void vout_SendEventMouseMoved(vout_thread_t *vout, int x, int y)
 {
     var_SetInteger(vout, "mouse-x", x);
     var_SetInteger(vout, "mouse-y", y);
-    var_SetBool(vout, "mouse-moved", true);
+    var_TriggerCallback(vout, "mouse-moved");
 }
 static inline void vout_SendEventMousePressed(vout_thread_t *vout, int button)
 {

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 58ce6603ad86b21b12790ba23ccfd26b1ae51441..2f4bbd71d7eb21650e82795ac4d5cc75df1d27c5 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -405,7 +405,7 @@ vout_thread_t * vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
     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-moved", VLC_VAR_VOID );
     var_Create( p_vout, "mouse-clicked", VLC_VAR_BOOL );
     /* Mouse object (area of interest in a video filter) */
     var_Create( p_vout, "mouse-object", VLC_VAR_BOOL );

diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index fc8369ebbd58d4a6d19bf13978cbfd789526cc1e..93efb3bd96dec56be3d7312775d38a802a51671f 100644 (file)
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -366,7 +366,7 @@ void vout_IntfInit( vout_thread_t *p_vout )
     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-moved", VLC_VAR_VOID );
     var_Create( p_vout, "mouse-clicked", VLC_VAR_BOOL );
     var_Create( p_vout, "mouse-object", VLC_VAR_BOOL );