Remove useless mouse buttons table

diff --git a/include/vlc_mouse.h b/include/vlc_mouse.h
index c7517d9df50a21076b5102f30f5bb015e68bee4c..a4b1d6b9a5249f50a8498063fa79a0cac9838b79 100644 (file)
--- a/include/vlc_mouse.h
+++ b/include/vlc_mouse.h
@@ -25,15 +25,16 @@
 #define _VLC_MOUSE_H 1
 
 /**
- * Mouse button
+ * Mouse buttons
  */
 enum
 {
-    MOUSE_BUTTON_LEFT,
+    MOUSE_BUTTON_LEFT=0,
     MOUSE_BUTTON_CENTER,
     MOUSE_BUTTON_RIGHT,
     MOUSE_BUTTON_WHEEL_UP,
     MOUSE_BUTTON_WHEEL_DOWN,
+    MOUSE_BUTTON_MAX
 };
 
 /**

diff --git a/src/video_output/display.c b/src/video_output/display.c
index 72b37041ce18f847526a2edcda31c140631924da..434ffbff62f85da995647c06f32a883c00ab257d 100644 (file)
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -1627,16 +1627,7 @@ void vout_SendDisplayEventMouse(vout_thread_t *vout, const vlc_mouse_t *m)
         vout_SendEventMouseMoved(vout, m->i_x, m->i_y);
     }
     if (vlc_mouse_HasButton(&vout->p->mouse, m)) {
-        static const int buttons[] = {
-            MOUSE_BUTTON_LEFT,
-            MOUSE_BUTTON_CENTER,
-            MOUSE_BUTTON_RIGHT,
-            MOUSE_BUTTON_WHEEL_UP,
-            MOUSE_BUTTON_WHEEL_DOWN,
-            -1
-        };
-        for (int i = 0; buttons[i] >= 0; i++) {
-            const int button = buttons[i];
+        for (unsigned button = 0; button < MOUSE_BUTTON_MAX; button++) {
             if (vlc_mouse_HasPressed(&vout->p->mouse, m, button))
                 vout_SendEventMousePressed(vout, button);
             else if (vlc_mouse_HasReleased(&vout->p->mouse, m, button))