[vlc-commits] display: remove redundant place parameter

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Dec 31 17:32:01 2018 +0200| [e031ba7eeedde6429e32a43b8e50254b86c8aad5] | committer: Rémi Denis-Courmont

display: remove redundant place parameter

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

 include/vlc_vout_display.h           | 4 +---
 modules/video_output/caopengllayer.m | 3 +--
 modules/video_output/ios.m           | 3 +--
 modules/video_output/macosx.m        | 3 +--
 src/video_output/display.c           | 5 ++++-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index e7c5af330e..ac58b44cfb 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -442,10 +442,8 @@ void vout_display_TranslateMouseState(vout_display_t *vd, vlc_mouse_t *video,
  * \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).
- * \param place Place of the picture.
  */
-VLC_API void vout_display_SendMouseMovedDisplayCoordinates(vout_display_t *vd, int m_x, int m_y,
-                                                           vout_display_place_t *place);
+VLC_API void vout_display_SendMouseMovedDisplayCoordinates(vout_display_t *vd, int m_x, int m_y);
 
 /** @} */
 #endif /* VLC_VOUT_DISPLAY_H */
diff --git a/modules/video_output/caopengllayer.m b/modules/video_output/caopengllayer.m
index 65bbf31bc7..285f3f79df 100644
--- a/modules/video_output/caopengllayer.m
+++ b/modules/video_output/caopengllayer.m
@@ -560,8 +560,7 @@ static void *OurGetProcAddress (vlc_gl_t *gl, const char *name)
         if (_voutDisplay) {
             vout_display_SendMouseMovedDisplayCoordinates (_voutDisplay,
                                                            xValue,
-                                                           yValue,
-                                                           &_voutDisplay->sys->place);
+                                                           yValue);
         }
     }
 }
diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m
index dae082e6e6..40d0a35578 100644
--- a/modules/video_output/ios.m
+++ b/modules/video_output/ios.m
@@ -712,8 +712,7 @@ static void GLESSwap(vlc_gl_t *gl)
     CGPoint touchPoint = [tapRecognizer locationInView:self];
     CGFloat scaleFactor = self.contentScaleFactor;
     vout_display_SendMouseMovedDisplayCoordinates(_voutDisplay,
-                                                  (int)touchPoint.x * scaleFactor, (int)touchPoint.y * scaleFactor,
-                                                  &_place);
+                                                  (int)touchPoint.x * scaleFactor, (int)touchPoint.y * scaleFactor);
 
     vout_display_SendEventMousePressed(_voutDisplay, MOUSE_BUTTON_LEFT);
     vout_display_SendEventMouseReleased(_voutDisplay, MOUSE_BUTTON_LEFT);
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 42c513e460..187e6e8bee 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -785,8 +785,7 @@ static void OpenglSwap (vlc_gl_t *gl)
         @synchronized (self) {
             if (vd) {
                 vout_display_SendMouseMovedDisplayCoordinates(vd,
-                                                              (int)ml.x, videoRect.size.height - (int)ml.y,
-                                                              &vd->sys->place);
+                                                              (int)ml.x, videoRect.size.height - (int)ml.y);
             }
         }
     }
diff --git a/src/video_output/display.c b/src/video_output/display.c
index 35d13525ef..35a442eef7 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -267,9 +267,12 @@ 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_display_place_t *place)
+void vout_display_SendMouseMovedDisplayCoordinates(vout_display_t *vd, int m_x, int m_y)
 {
     video_format_t source_rot = vd->source;
+    vout_display_place_t *place = &(vout_display_place_t) { };
+
+    vout_display_PlacePicture(place, &vd->source, vd->cfg);
 
     if (place->width > 0 && place->height > 0) {