Commit 67daaa16 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

mouse-clicked is a boolean

It was created as an integer and set as a boolean...
parent fc4676a3
...@@ -1123,9 +1123,7 @@ VLCView::MouseDown(BPoint where) ...@@ -1123,9 +1123,7 @@ VLCView::MouseDown(BPoint where)
void void
VLCView::MouseUp( BPoint where ) VLCView::MouseUp( BPoint where )
{ {
vlc_value_t val; var_SetBool( p_vout, "mouse-clicked", true );
val.b_bool = true;
var_Set( p_vout, "mouse-clicked", val );
} }
/***************************************************************************** /*****************************************************************************
......
...@@ -579,9 +579,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -579,9 +579,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
if( p_vout && [o_event type] == NSLeftMouseUp ) if( p_vout && [o_event type] == NSLeftMouseUp )
{ {
vlc_value_t b_val; var_SetBool( p_vout, "mouse-clicked", true );
b_val.b_bool = true;
var_Set( p_vout, "mouse-clicked", b_val );
var_Get( p_vout, "mouse-button-down", &val ); var_Get( p_vout, "mouse-button-down", &val );
val.i_int &= ~1; val.i_int &= ~1;
......
...@@ -956,8 +956,7 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event ...@@ -956,8 +956,7 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event
{ {
vlc_value_t val; vlc_value_t val;
val.b_bool = true; var_SetBool( p_vout, "mouse-clicked", true );
var_Set( p_vout, "mouse-clicked", val );
var_Get( p_vout, "mouse-button-down", &val ); var_Get( p_vout, "mouse-button-down", &val );
val.i_int &= ~1; val.i_int &= ~1;
......
...@@ -542,8 +542,7 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event ...@@ -542,8 +542,7 @@ static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, Event
{ {
vlc_value_t val; vlc_value_t val;
val.b_bool = true; var_SetBool( p_vout, "mouse-clicked", true );
var_Set( p_vout, "mouse-clicked", val );
var_Get( p_vout, "mouse-button-down", &val ); var_Get( p_vout, "mouse-button-down", &val );
val.i_int &= ~1; val.i_int &= ~1;
......
...@@ -366,8 +366,7 @@ static int Manage( vout_thread_t *p_vout ) ...@@ -366,8 +366,7 @@ static int Manage( vout_thread_t *p_vout )
var_Set( p_vout, "mouse-moved", val ); var_Set( p_vout, "mouse-moved", val );
break; break;
case CACA_EVENT_MOUSE_RELEASE: case CACA_EVENT_MOUSE_RELEASE:
val.b_bool = true; var_SetBool( p_vout, "mouse-clicked", true );
var_Set( p_vout, "mouse-clicked", val );
break; break;
case CACA_EVENT_QUIT: case CACA_EVENT_QUIT:
{ {
......
...@@ -306,8 +306,7 @@ static int Manage( vout_thread_t *p_vout ) ...@@ -306,8 +306,7 @@ static int Manage( vout_thread_t *p_vout )
switch( event.pbutton.button ) switch( event.pbutton.button )
{ {
case GII_PBUTTON_LEFT: case GII_PBUTTON_LEFT:
val.b_bool = true; var_SetBool( p_vout, "mouse-clicked", true );
var_Set( p_vout, "mouse-clicked", val );
break; break;
case GII_PBUTTON_RIGHT: case GII_PBUTTON_RIGHT:
......
...@@ -222,8 +222,7 @@ void* EventThread( vlc_object_t *p_this ) ...@@ -222,8 +222,7 @@ void* EventThread( vlc_object_t *p_this )
val.i_int &= ~1; val.i_int &= ~1;
var_Set( p_event->p_vout, "mouse-button-down", val ); var_Set( p_event->p_vout, "mouse-button-down", val );
val.b_bool = true; var_SetBool( p_event->p_vout, "mouse-clicked", true );
var_Set( p_event->p_vout, "mouse-clicked", val );
break; break;
case WM_LBUTTONDBLCLK: case WM_LBUTTONDBLCLK:
......
...@@ -220,7 +220,7 @@ static int CreateVout( vlc_object_t *p_this ) ...@@ -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-x", VLC_VAR_INTEGER );
var_Create( p_sys->p_vout, "mouse-y", 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_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, "mouse-button-down", VLC_VAR_INTEGER );
var_Create( p_sys->p_vout, "video-on-top", var_Create( p_sys->p_vout, "video-on-top",
VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
......
...@@ -436,8 +436,7 @@ static int Manage( vout_thread_t *p_vout ) ...@@ -436,8 +436,7 @@ static int Manage( vout_thread_t *p_vout )
val.i_int &= ~1; val.i_int &= ~1;
var_Set( p_vout, "mouse-button-down", val ); var_Set( p_vout, "mouse-button-down", val );
val.b_bool = true; var_SetBool( p_vout, "mouse-clicked", true );
var_Set( p_vout, "mouse-clicked", val );
val.b_bool = false; val.b_bool = false;
var_Set( p_vout->p_libvlc, "intf-popupmenu", val ); var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
......
...@@ -1301,8 +1301,7 @@ static int ManageVideo( vout_thread_t *p_vout ) ...@@ -1301,8 +1301,7 @@ static int ManageVideo( vout_thread_t *p_vout )
val.i_int &= ~1; val.i_int &= ~1;
var_Set( p_vout, "mouse-button-down", val ); var_Set( p_vout, "mouse-button-down", val );
val.b_bool = true; var_SetBool( p_vout, "mouse-clicked", true );
var_Set( p_vout, "mouse-clicked", val );
vlc_value_t val; val.b_bool = false; vlc_value_t val; val.b_bool = false;
var_Set( p_vout->p_libvlc, "intf-popupmenu", val ); var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
......
...@@ -403,7 +403,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) ...@@ -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-y", VLC_VAR_INTEGER );
var_Create( p_vout, "mouse-button-down", 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_BOOL );
var_Create( p_vout, "mouse-clicked", VLC_VAR_INTEGER ); var_Create( p_vout, "mouse-clicked", VLC_VAR_BOOL );
/* Initialize subpicture unit */ /* Initialize subpicture unit */
p_vout->p_spu = spu_Create( p_vout ); p_vout->p_spu = spu_Create( p_vout );
......
...@@ -432,7 +432,7 @@ void vout_IntfInit( vout_thread_t *p_vout ) ...@@ -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-y", VLC_VAR_INTEGER );
var_Create( p_vout, "mouse-button-down", 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_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_Create( p_vout, "intf-change", VLC_VAR_BOOL );
var_SetBool( p_vout, "intf-change", true ); var_SetBool( p_vout, "intf-change", true );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment