From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sat, 13 Feb 2010 16:02:14 +0000 (+0200)
Subject: Make mouse-moved a void variable
X-Git-Tag: 1.1.0-ff~114
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=180c722e1eb51f1ae6f59545b3d8dcb312e9ea5f;p=vlc

Make mouse-moved a void variable
---

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index be05431b9e..d65dbbca79 100644
--- 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 abe1a321e6..4a496cd53c 100644
--- 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 80425c2bd6..58f457f2de 100644
--- 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 928f4034b5..d01527fc88 100644
--- 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 c1dfb444b5..fa1d048637 100644
--- 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 bbc7812c4a..bf9087c163 100644
--- 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 58ce6603ad..2f4bbd71d7 100644
--- 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 fc8369ebbd..93efb3bd96 100644
--- 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 );