[vlc-commits] display: remove constant parameter

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Dec 30 23:53:20 2018 +0200| [f0a92ea10938f956458e13c2ca8a2d909a642bac] | committer: Rémi Denis-Courmont

display: remove constant parameter

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

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

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index 32fb1ea751..e7c5af330e 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -440,12 +440,11 @@ void vout_display_TranslateMouseState(vout_display_t *vd, vlc_mouse_t *video,
  * and then calls vout_display_SendEventMouseMoved.
  *
  * \param vd vout_display_t.
- * \param orient_display The orientation of the picture as seen on screen (probably ORIENT_NORMAL).
  * \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, video_orientation_t orient_display, int m_x, int m_y,
+VLC_API void vout_display_SendMouseMovedDisplayCoordinates(vout_display_t *vd, int m_x, int m_y,
                                                            vout_display_place_t *place);
 
 /** @} */
diff --git a/modules/video_output/caopengllayer.m b/modules/video_output/caopengllayer.m
index d0c55dd2a7..65bbf31bc7 100644
--- a/modules/video_output/caopengllayer.m
+++ b/modules/video_output/caopengllayer.m
@@ -559,7 +559,6 @@ static void *OurGetProcAddress (vlc_gl_t *gl, const char *name)
     @synchronized (self) {
         if (_voutDisplay) {
             vout_display_SendMouseMovedDisplayCoordinates (_voutDisplay,
-                                                           ORIENT_NORMAL,
                                                            xValue,
                                                            yValue,
                                                            &_voutDisplay->sys->place);
diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m
index 912f33590b..dae082e6e6 100644
--- a/modules/video_output/ios.m
+++ b/modules/video_output/ios.m
@@ -711,7 +711,7 @@ static void GLESSwap(vlc_gl_t *gl)
     UIGestureRecognizerState state = [tapRecognizer state];
     CGPoint touchPoint = [tapRecognizer locationInView:self];
     CGFloat scaleFactor = self.contentScaleFactor;
-    vout_display_SendMouseMovedDisplayCoordinates(_voutDisplay, ORIENT_NORMAL,
+    vout_display_SendMouseMovedDisplayCoordinates(_voutDisplay,
                                                   (int)touchPoint.x * scaleFactor, (int)touchPoint.y * scaleFactor,
                                                   &_place);
 
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 86b08156cf..42c513e460 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -784,7 +784,7 @@ static void OpenglSwap (vlc_gl_t *gl)
     if (b_inside) {
         @synchronized (self) {
             if (vd) {
-                vout_display_SendMouseMovedDisplayCoordinates(vd, ORIENT_NORMAL,
+                vout_display_SendMouseMovedDisplayCoordinates(vd,
                                                               (int)ml.x, videoRect.size.height - (int)ml.y,
                                                               &vd->sys->place);
             }
diff --git a/src/video_output/display.c b/src/video_output/display.c
index 4e1d04d58d..35d13525ef 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -267,10 +267,9 @@ 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, video_orientation_t orient_display, 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, vout_display_place_t *place)
 {
     video_format_t source_rot = vd->source;
-    video_format_TransformTo(&source_rot, orient_display);
 
     if (place->width > 0 && place->height > 0) {
 
@@ -279,7 +278,7 @@ void vout_display_SendMouseMovedDisplayCoordinates(vout_display_t *vd, video_ori
         int y = (int)(source_rot.i_y_offset +
                             (int64_t)(m_y - place->y) * source_rot.i_visible_height/ place->height);
 
-        video_transform_t transform = video_format_GetTransform(vd->source.orientation, orient_display);
+        video_transform_t transform = video_format_GetTransform(vd->source.orientation, ORIENT_NORMAL);
 
         int store;