Removed dead code (vout).

[vlc] / src / video_output / event.h

diff --git a/src/video_output/event.h b/src/video_output/event.h
index 74a8a1a9c0b9bd9f256d03dd4dc099bbb6f4d262..948d317fd14f2902d8356425fa5021773339621b 100644 (file)
--- a/src/video_output/event.h
+++ b/src/video_output/event.h
@@ -47,11 +47,8 @@ static inline void vout_SendEventClose(vout_thread_t *vout)
     /* Ask to stop
      * FIXME works only for input handled by the playlist
      */
-    playlist_t *playlist = pl_Hold(vout);
-    if (playlist) {
-        playlist_Stop(playlist);
-        pl_Release(vout);
-    }
+    playlist_t *playlist = pl_Get(vout);
+    playlist_Stop(playlist);
 }
 static inline void vout_SendEventKey(vout_thread_t *vout, int key)
 {
@@ -59,25 +56,25 @@ static inline void vout_SendEventKey(vout_thread_t *vout, int key)
 }
 static inline void vout_SendEventMouseMoved(vout_thread_t *vout, int x, int y)
 {
-    var_SetInteger(vout, "mouse-x", x);
-    var_SetInteger(vout, "mouse-y", y);
-    var_SetBool(vout, "mouse-moved", true);
+    var_SetCoords(vout, "mouse-moved", x, y);
 }
 static inline void vout_SendEventMousePressed(vout_thread_t *vout, int button)
 {
-    int current = var_GetInteger(vout, "mouse-button-down");
-    current |= 1 << button;
-    var_SetInteger(vout, "mouse-button-down", current);
+    var_OrInteger(vout, "mouse-button-down", 1 << button);
 
     switch (button)
     {
     case MOUSE_BUTTON_LEFT:
-                var_SetBool(vout, "mouse-clicked", true);
+    {
+        /* FIXME? */
+        int x, y;
+        var_GetCoords(vout, "mouse-moved", &x, &y);
+        var_SetCoords(vout, "mouse-clicked", x, y);
         var_SetBool(vout->p_libvlc, "intf-popupmenu", false);
         break;
+    }
     case MOUSE_BUTTON_CENTER:
-        var_SetBool(vout->p_libvlc, "intf-show",
-                     !var_GetBool(vout->p_libvlc, "intf-show"));
+        var_ToggleBool(vout->p_libvlc, "intf-show");
         break;
     case MOUSE_BUTTON_RIGHT:
         var_SetBool(vout->p_libvlc, "intf-popupmenu", true);
@@ -86,14 +83,13 @@ static inline void vout_SendEventMousePressed(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");
-    current &= ~(1 << button);
-    var_SetInteger(vout, "mouse-button-down", current);
+    var_NAndInteger(vout, "mouse-button-down", 1 << button);
 }
 static inline void vout_SendEventMouseDoubleClick(vout_thread_t *vout)
 {
     //vout_ControlSetFullscreen(vout, !var_GetBool(vout, "fullscreen"));
-    var_ToggleBool(vout, "fullscreen");
+    //var_ToggleBool(vout, "fullscreen");
+    var_SetInteger(vout->p_libvlc, "key-action", ACTIONID_TOGGLE_FULLSCREEN);
 }
 static inline void vout_SendEventMouseVisible(vout_thread_t *vout)
 {
@@ -108,8 +104,7 @@ static inline void vout_SendEventMouseHidden(vout_thread_t *vout)
 
 static inline void vout_SendEventFullscreen(vout_thread_t *vout, bool is_fullscreen)
 {
-    if (!var_GetBool(vout, "fullscreen") != !is_fullscreen)
-        var_SetBool(vout, "fullscreen", is_fullscreen);
+    var_SetBool(vout, "fullscreen", is_fullscreen);
 }
 
 static inline void vout_SendEventDisplayFilled(vout_thread_t *vout, bool is_display_filled)