Skip to content

V
vlc-1.1
Commit 57f92bde authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

vout event: use var_GetAndSet

parent 7e6c2325
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 8 deletions
src/video_output/event.h
View file @ 57f92bde
...@@ -65,9 +65,7 @@ static inline void vout_SendEventMouseMoved(vout_thread_t *vout, int x, int y) ...@@ -65,9 +65,7 @@ static inline void vout_SendEventMouseMoved(vout_thread_t *vout, int x, int y)
} }
static inline void vout_SendEventMousePressed(vout_thread_t *vout, int button) static inline void vout_SendEventMousePressed(vout_thread_t *vout, int button)
{ {
int current = var_GetInteger(vout, "mouse-button-down"); var_OrInteger(vout, "mouse-button-down", 1 << button);
current |= 1 << button;
var_SetInteger(vout, "mouse-button-down", current);
switch (button) switch (button)
{ {
...@@ -76,8 +74,7 @@ static inline void vout_SendEventMousePressed(vout_thread_t *vout, int button) ...@@ -76,8 +74,7 @@ static inline void vout_SendEventMousePressed(vout_thread_t *vout, int button)
var_SetBool(vout->p_libvlc, "intf-popupmenu", false); var_SetBool(vout->p_libvlc, "intf-popupmenu", false);
break; break;
case MOUSE_BUTTON_CENTER: case MOUSE_BUTTON_CENTER:
var_SetBool(vout->p_libvlc, "intf-show", var_ToggleBool(vout->p_libvlc, "intf-show");
!var_GetBool(vout->p_libvlc, "intf-show"));
break; break;
case MOUSE_BUTTON_RIGHT: case MOUSE_BUTTON_RIGHT:
var_SetBool(vout->p_libvlc, "intf-popupmenu", true); var_SetBool(vout->p_libvlc, "intf-popupmenu", true);
...@@ -86,9 +83,7 @@ static inline void vout_SendEventMousePressed(vout_thread_t *vout, int button) ...@@ -86,9 +83,7 @@ static inline void vout_SendEventMousePressed(vout_thread_t *vout, int button)
} }
static inline void vout_SendEventMouseReleased(vout_thread_t *vout, int button) static inline void vout_SendEventMouseReleased(vout_thread_t *vout, int button)
{ {
int current = var_GetInteger(vout, "mouse-button-down"); var_NAndInteger(vout, "mouse-button-down", 1 << button);
current &= ~(1 << button);
var_SetInteger(vout, "mouse-button-down", current);
} }
static inline void vout_SendEventMouseDoubleClick(vout_thread_t *vout) static inline void vout_SendEventMouseDoubleClick(vout_thread_t *vout)
{ {
......
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