Modified the prototype of vout_Request and unexport unused vout_Create.

[vlc] / src / video_output / event.h

diff --git a/src/video_output/event.h b/src/video_output/event.h
index fff6f2642d172ede4e02872e8c3d8de653e5d362..0cb1042c556d8a2ee639925774c994e2d800ec4e 100644 (file)
--- a/src/video_output/event.h
+++ b/src/video_output/event.h
@@ -44,56 +44,58 @@
 
 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);
-       }
+    /* Ask to stop
+     * FIXME works only for input handled by the playlist
+     */
+    playlist_t *playlist = pl_Get(vout);
+    playlist_Stop(playlist);
 }
 static inline void vout_SendEventKey(vout_thread_t *vout, int key)
 {
-       var_SetInteger(vout->p_libvlc, "key-pressed", key);
+    var_SetInteger(vout->p_libvlc, "key-pressed", 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);
-               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"));
-               break;
-       case MOUSE_BUTTON_RIGHT:
-               var_SetBool(vout->p_libvlc, "intf-popupmenu", true);
-               break;
-       }
+    switch (button)
+    {
+    case MOUSE_BUTTON_LEFT:
+    {
+        /* 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_ToggleBool(vout->p_libvlc, "intf-show");
+        break;
+    case MOUSE_BUTTON_RIGHT:
+        var_SetBool(vout->p_libvlc, "intf-popupmenu", true);
+        break;
+    case MOUSE_BUTTON_WHEEL_UP:
+        vout_SendEventKey(vout, KEY_MOUSEWHEELUP);
+        break;
+    case MOUSE_BUTTON_WHEEL_DOWN:
+        vout_SendEventKey(vout, KEY_MOUSEWHEELDOWN);
+        break;
+    }
 }
 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 +110,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)
@@ -220,10 +221,8 @@ static inline void vout_SendEventSourceCrop(vout_thread_t *vout,
 #if 0
 static inline void vout_SendEventSnapshot(vout_thread_t *vout, const char *filename)
 {
-    /* Generate a media player event  - Right now just trigger a global libvlc var
-        CHECK: Could not find a more local object. The goal is to communicate
-        vout_thread with libvlc_media_player or its input_thread */
-    var_SetString(vout->p_libvlc, "vout-snapshottaken", filename);
+    /* signal creation of a new snapshot file */
+    var_SetString(vout->p_libvlc, "snapshot-file", filename);
 }
 
 #warning "FIXME clean up postproc event"