[vlc-devel] commit: mouse-clicked is a boolean ( Rémi Denis-Courmont )
git version control
git at videolan.org
Sun Jan 25 12:11:57 CET 2009
vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Jan 25 12:30:28 2009 +0200| [67daaa16e0ce6cea8878f48b44fb9b19f5e66d12] | committer: Rémi Denis-Courmont
mouse-clicked is a boolean
It was created as an integer and set as a boolean...
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=67daaa16e0ce6cea8878f48b44fb9b19f5e66d12
---
modules/gui/beos/VideoOutput.cpp | 4 +---
modules/gui/macosx/vout.m | 4 +---
modules/gui/macosx/voutgl.m | 3 +--
modules/gui/minimal_macosx/voutagl.m | 3 +--
modules/video_output/caca.c | 3 +--
modules/video_output/ggi.c | 3 +--
modules/video_output/msw/events.c | 3 +--
modules/video_output/opengl.c | 2 +-
modules/video_output/sdl.c | 3 +--
modules/video_output/x11/xcommon.c | 3 +--
src/video_output/video_output.c | 2 +-
src/video_output/vout_intf.c | 2 +-
12 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/modules/gui/beos/VideoOutput.cpp b/modules/gui/beos/VideoOutput.cpp
index e808b7d..181b3b2 100644
--- 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 29c93c8..645bc3d 100644
--- 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 5f5f5e7..ec804ad 100644
--- 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 e07880f..92f9f6f 100644
--- 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 b94e71f..2f8f24a 100644
--- 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 348fc4f..1270d77 100644
--- 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 0d60399..ae1a26a 100644
--- 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 1bbb612..568217e 100644
--- 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 08fb157..187e539 100644
--- 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 fd4548c..5ba486d 100644
--- 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 6ffe6ae..27de388 100644
--- 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 e4dd70c..0f837ff 100644
--- 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 );
More information about the vlc-devel
mailing list