[vlc-commits] display: remove VOUT_DISPLAY_HIDE_MOUSE handling (refs #18661)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri May 18 16:04:19 2018 +0300| [e895b74713ae8810a6925407980cec65964b507b] | committer: Rémi Denis-Courmont

display: remove VOUT_DISPLAY_HIDE_MOUSE handling (refs #18661)

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

 include/vlc_vout_display.h | 7 -------
 src/video_output/display.c | 5 +----
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index 9f6bf4cc91..c8b365c229 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -113,9 +113,6 @@ typedef struct {
 typedef struct {
     bool is_slow;                           /* The picture memory has slow read/write */
     bool has_double_click;                  /* Is double-click generated */
-    bool needs_hide_mouse;                  /* Needs VOUT_DISPLAY_HIDE_MOUSE,
-                                             * needs to call vout_display_SendEventMouseMoved()
-                                             * or vout_display_SendEventMouseState() */
     bool has_pictures_invalid;              /* Will VOUT_DISPLAY_EVENT_PICTURES_INVALID be used */
     const vlc_fourcc_t *subpicture_chromas; /* List of supported chromas for subpicture rendering. */
 } vout_display_info_t;
@@ -124,10 +121,6 @@ typedef struct {
  * Control query for vout_display_t
  */
 enum {
-    /* Hide the mouse. It will be sent when
-     * vout_display_t::info.needs_hide_mouse is true */
-    VOUT_DISPLAY_HIDE_MOUSE VLC_DEPRECATED_ENUM,
-
     /* Ask to reset the internal buffers after a VOUT_DISPLAY_EVENT_PICTURES_INVALID
      * request.
      */
diff --git a/src/video_output/display.c b/src/video_output/display.c
index 004525b606..e87f877f97 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -92,7 +92,6 @@ static vout_display_t *vout_display_New(vlc_object_t *obj,
 
     vd->info.is_slow = false;
     vd->info.has_double_click = false;
-    vd->info.needs_hide_mouse = false;
     vd->info.has_pictures_invalid = false;
     vd->info.subpicture_chromas = NULL;
 
@@ -733,9 +732,7 @@ bool vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures)
 
     if (hide_mouse) {
         msg_Dbg(vd, "auto hiding mouse cursor");
-        if (vout_HideWindowMouse(osys->vout, true) != VLC_SUCCESS
-         && vd->info.needs_hide_mouse)
-            vout_display_Control(vd, VOUT_DISPLAY_HIDE_MOUSE);
+        vout_HideWindowMouse(osys->vout, true);
     }
 
     bool reset_render = false;