[vlc-commits] vout_display: inline vout_display_SendMouseMovedDisplayCoordinates()

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Mar 26 08:21:28 2019 +0100| [b0e1d401cb3c38a5fb6f4ebd733530bb6b65cd0e] | committer: Steve Lhomme

vout_display: inline vout_display_SendMouseMovedDisplayCoordinates()

Just like the other vout_display mouse functions.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b0e1d401cb3c38a5fb6f4ebd733530bb6b65cd0e
---

 include/vlc_vout_display.h | 23 +++++++++++++----------
 src/libvlccore.sym         |  1 -
 src/video_output/display.c |  5 -----
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index eff57f2a13..2f273689b3 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -406,6 +406,19 @@ static inline void vout_display_SendEventViewpointMoved(vout_display_t *vd,
     vout_display_SendEvent(vd, VOUT_DISPLAY_EVENT_VIEWPOINT_MOVED, vp);
 }
 
+/**
+ * Helper function that applies the necessary transforms to the mouse position
+ * and then calls vout_display_SendEventMouseMoved.
+ *
+ * \param vd vout_display_t.
+ * \param m_x Mouse x position (relative to place, origin is top left).
+ * \param m_y Mouse y position (relative to place, origin is top left).
+ */
+static inline void vout_display_SendMouseMovedDisplayCoordinates(vout_display_t *vd, int m_x, int m_y)
+{
+    vout_window_ReportMouseMoved(vd->cfg->window, m_x, m_y);
+}
+
 static inline bool vout_display_cfg_IsWindowed(const vout_display_cfg_t *cfg)
 {
     return cfg->window->type != VOUT_WINDOW_TYPE_DUMMY;
@@ -451,15 +464,5 @@ VLC_API void vout_display_PlacePicture(vout_display_place_t *place, const video_
 void vout_display_TranslateMouseState(vout_display_t *vd, vlc_mouse_t *video,
                                       const vlc_mouse_t *window);
 
-/**
- * Helper function that applies the necessary transforms to the mouse position
- * and then calls vout_display_SendEventMouseMoved.
- *
- * \param vd vout_display_t.
- * \param m_x Mouse x position (relative to place, origin is top left).
- * \param m_y Mouse y position (relative to place, origin is top left).
- */
-VLC_API void vout_display_SendMouseMovedDisplayCoordinates(vout_display_t *vd, int m_x, int m_y);
-
 /** @} */
 #endif /* VLC_VOUT_DISPLAY_H */
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 839390654e..19ec18d0c2 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -768,7 +768,6 @@ vout_window_Disable
 vout_display_GetDefaultDisplaySize
 vout_display_PlacePicture
 vout_display_SendEventPicturesInvalid
-vout_display_SendMouseMovedDisplayCoordinates
 vout_display_New
 vout_display_Delete
 vout_display_Prepare
diff --git a/src/video_output/display.c b/src/video_output/display.c
index 68cd8b671c..2928631a29 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -269,11 +269,6 @@ void vout_display_TranslateMouseState(vout_display_t *vd, vlc_mouse_t *video,
     video->b_double_click = window->b_double_click;
 }
 
-void vout_display_SendMouseMovedDisplayCoordinates(vout_display_t *vd, int m_x, int m_y)
-{
-    vout_window_ReportMouseMoved(vd->cfg->window, m_x, m_y);
-}
-
 typedef struct {
     vout_display_t  display;