mouse-clicked is a boolean

It was created as an integer and set as a boolean...

diff --git a/modules/gui/beos/VideoOutput.cpp b/modules/gui/beos/VideoOutput.cpp
index e808b7d07e8923452d8945fce391fd67772266ae..181b3b29c76118616e1e68a657e054de063fcdf2 100644 (file)
--- a/modules/gui/beos/VideoOutput.cpp
+++ b/modules/gui/beos/VideoOutput.cpp
@@ -1123,9 +1123,7 @@ VLCView::MouseDown(BPoint where)
 void
 VLCView::MouseUp( BPoint where )
 {
-    vlc_value_t val;
-    val.b_bool = true;
-    var_Set( p_vout, "mouse-clicked", val );
+    var_SetBool( p_vout, "mouse-clicked", true );
 }
 
 /*****************************************************************************

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index 29c93c87f74ac0abc01b50ebe4402068d6edbd60..645bc3d84e38bc55dca327d7896c3766adb34c44 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -579,9 +579,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
 
     if( p_vout && [o_event type] == NSLeftMouseUp )
     {
-        vlc_value_t b_val;
-        b_val.b_bool = true;
-        var_Set( p_vout, "mouse-clicked", b_val );
+        var_SetBool( p_vout, "mouse-clicked", true );
 
         var_Get( p_vout, "mouse-button-down", &val );
         val.i_int &= ~1;

diff --git a/modules/gui/macosx/voutgl.m b/modules/gui/macosx/voutgl.m
index 5f5f5e724f5234e903502dc7a574eb2edf6c1de1..ec804ad67dc0d26eec059abe70dbb7380096740a 100644 (file)
--- a/modules/gui/macosx/voutgl.m
+++ b/modules/gui/macosx/voutgl.m
@@ -956,8 +956,7 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event
                         {
                             vlc_value_t val;
 
-                            val.b_bool = true;
-                            var_Set( p_vout, "mouse-clicked", val );
+                            var_SetBool( p_vout, "mouse-clicked", true );
 
                             var_Get( p_vout, "mouse-button-down", &val );
                             val.i_int &= ~1;

diff --git a/modules/gui/minimal_macosx/voutagl.m b/modules/gui/minimal_macosx/voutagl.m
index e07880fe2b8024d773d4ad416bcc801ffed92f5d..92f9f6f356f446ca09c09d296290b57daa7ab531 100644 (file)
--- a/modules/gui/minimal_macosx/voutagl.m
+++ b/modules/gui/minimal_macosx/voutagl.m
@@ -542,8 +542,7 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event
                         {
                             vlc_value_t val;
 
-                            val.b_bool = true;
-                            var_Set( p_vout, "mouse-clicked", val );
+                            var_SetBool( p_vout, "mouse-clicked", true );
 
                             var_Get( p_vout, "mouse-button-down", &val );
                             val.i_int &= ~1;

diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index b94e71f0392bea9b5759f5b9e272c1c6bcc5103a..2f8f24a6f0d8ce5cf07491f7ed15fdb99a12fa6e 100644 (file)
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -366,8 +366,7 @@ static int Manage( vout_thread_t *p_vout )
             var_Set( p_vout, "mouse-moved", val );
             break;
         case CACA_EVENT_MOUSE_RELEASE:
-            val.b_bool = true;
-            var_Set( p_vout, "mouse-clicked", val );
+            var_SetBool( p_vout, "mouse-clicked", true );
             break;
         case CACA_EVENT_QUIT:
         {

diff --git a/modules/video_output/ggi.c b/modules/video_output/ggi.c
index 348fc4f68485976ae0353674c2d8e2aaa7dc684a..1270d776dfdef6db1cfb1157a5aaa427427ff2e4 100644 (file)
--- a/modules/video_output/ggi.c
+++ b/modules/video_output/ggi.c
@@ -306,8 +306,7 @@ static int Manage( vout_thread_t *p_vout )
                 switch( event.pbutton.button )
                 {
                     case GII_PBUTTON_LEFT:
-                        val.b_bool = true;
-                        var_Set( p_vout, "mouse-clicked", val );
+                        var_SetBool( p_vout, "mouse-clicked", true );
                         break;
 
                     case GII_PBUTTON_RIGHT:

diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index 0d603992502cd291c4e3d74f22ccd8a8afeaec2b..ae1a26a7f56ddbf58d3465c7a7ae1fc1dc774ea6 100644 (file)
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -222,8 +222,7 @@ void* EventThread( vlc_object_t *p_this )
             val.i_int &= ~1;
             var_Set( p_event->p_vout, "mouse-button-down", val );
 
-            val.b_bool = true;
-            var_Set( p_event->p_vout, "mouse-clicked", val );
+            var_SetBool( p_event->p_vout, "mouse-clicked", true );
             break;
 
         case WM_LBUTTONDBLCLK:

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 1bbb6123b2af0bd4032b50f3e42a422964413617..568217ed10ebfa96a62affba93cadd748a758f5b 100644 (file)
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -220,7 +220,7 @@ static int CreateVout( vlc_object_t *p_this )
     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-clicked", VLC_VAR_INTEGER );
+    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",
                 VLC_VAR_BOOL | VLC_VAR_DOINHERIT );

diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
index 08fb157c8643f85c694ac8f4183f2a7c0f3e7388..187e539ce02daa98cfb644a68c37bc55baf5ee0a 100644 (file)
--- a/modules/video_output/sdl.c
+++ b/modules/video_output/sdl.c
@@ -436,8 +436,7 @@ static int Manage( vout_thread_t *p_vout )
                     val.i_int &= ~1;
                     var_Set( p_vout, "mouse-button-down", val );
 
-                    val.b_bool = true;
-                    var_Set( p_vout, "mouse-clicked", val );
+                    var_SetBool( p_vout, "mouse-clicked", true );
 
                     val.b_bool = false;
                     var_Set( p_vout->p_libvlc, "intf-popupmenu", val );

diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index fd4548c976e4199ccf2b33dae7137c2f6ce5e988..5ba486d2cac14013318352831cf63b40b9079e43 100644 (file)
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -1301,8 +1301,7 @@ static int ManageVideo( vout_thread_t *p_vout )
                         val.i_int &= ~1;
                         var_Set( p_vout, "mouse-button-down", val );
 
-                        val.b_bool = true;
-                        var_Set( p_vout, "mouse-clicked", val );
+                        var_SetBool( p_vout, "mouse-clicked", true );
 
                         vlc_value_t val; val.b_bool = false;
                         var_Set( p_vout->p_libvlc, "intf-popupmenu", val );

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 6ffe6ae9a85937f804346c6e5bb34730c868593d..27de3886e668edbfc80c5461cd1c9d30ade52f98 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -403,7 +403,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
     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, "mouse-clicked", VLC_VAR_BOOL );
 
     /* Initialize subpicture unit */
     p_vout->p_spu = spu_Create( p_vout );

diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index e4dd70ce47d373d05d6fa2616f001be00046ca64..0f837ff24485005b104d72c5b8ab957fa4288171 100644 (file)
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -432,7 +432,7 @@ void vout_IntfInit( vout_thread_t *p_vout )
     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, "mouse-clicked", VLC_VAR_BOOL );
 
     var_Create( p_vout, "intf-change", VLC_VAR_BOOL );
     var_SetBool( p_vout, "intf-change", true );