vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Sun Aug  6 
10:38:37 2017 +0300| [46a327ff5c2564e8bc7f81e419e456e8832a49a3] | committer: 
Rémi Denis-Courmont

vout: remove dummy dead VOUT_DISPLAY_HIDE_MOUSE controls

Depending on the value of info.has_hide_mouse, the control is never
called. No point in providing a dummy implementation then.

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

 modules/codec/omxil/vout.c             | 3 ---
 modules/hw/mmal/vout.c                 | 4 ----
 modules/hw/vdpau/display.c             | 2 --
 modules/video_output/android/display.c | 2 --
 modules/video_output/caopengllayer.m   | 2 +-
 modules/video_output/evas.c            | 1 -
 modules/video_output/flaschen.c        | 4 ----
 modules/video_output/ios.m             | 3 ---
 modules/video_output/macosx.m          | 2 +-
 modules/video_output/opengl/display.c  | 2 --
 modules/video_output/wayland/shm.c     | 4 ----
 modules/video_output/xcb/x11.c         | 3 ---
 modules/video_output/xcb/xvideo.c      | 2 --
 13 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/modules/codec/omxil/vout.c b/modules/codec/omxil/vout.c
index 3e659f2ced..a735466d5e 100644
--- a/modules/codec/omxil/vout.c
+++ b/modules/codec/omxil/vout.c
@@ -442,9 +442,6 @@ static int Control(vout_display_t *vd, int query, va_list 
args)
     VLC_UNUSED(args);
 
     switch (query) {
-    case VOUT_DISPLAY_HIDE_MOUSE:
-        return VLC_SUCCESS;
-
     default:
         msg_Err(vd, "Unknown request in omxil vout display");
 
diff --git a/modules/hw/mmal/vout.c b/modules/hw/mmal/vout.c
index edd2b767af..782ee48c4f 100644
--- a/modules/hw/mmal/vout.c
+++ b/modules/hw/mmal/vout.c
@@ -612,10 +612,6 @@ static int vd_control(vout_display_t *vd, int query, 
va_list args)
     int ret = VLC_EGENERIC;
 
     switch (query) {
-        case VOUT_DISPLAY_HIDE_MOUSE:
-            ret = VLC_SUCCESS;
-            break;
-
         case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
             tmp_cfg = va_arg(args, const vout_display_cfg_t *);
             if (tmp_cfg->display.width == sys->display_width &&
diff --git a/modules/hw/vdpau/display.c b/modules/hw/vdpau/display.c
index 767112a9ec..db314586dc 100644
--- a/modules/hw/vdpau/display.c
+++ b/modules/hw/vdpau/display.c
@@ -333,8 +333,6 @@ static int Control(vout_display_t *vd, int query, va_list 
ap)
 
     switch (query)
     {
-    case VOUT_DISPLAY_HIDE_MOUSE:
-        return VLC_EGENERIC;
     case VOUT_DISPLAY_RESET_PICTURES:
     {
         msg_Dbg(vd, "resetting pictures");
diff --git a/modules/video_output/android/display.c 
b/modules/video_output/android/display.c
index aa0cc94aff..574e91a579 100644
--- a/modules/video_output/android/display.c
+++ b/modules/video_output/android/display.c
@@ -1177,8 +1177,6 @@ static int Control(vout_display_t *vd, int query, va_list 
args)
     vout_display_sys_t *sys = vd->sys;
 
     switch (query) {
-    case VOUT_DISPLAY_HIDE_MOUSE:
-        return VLC_SUCCESS;
     case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
     case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
     {
diff --git a/modules/video_output/caopengllayer.m 
b/modules/video_output/caopengllayer.m
index 4232d29441..430531b2c4 100644
--- a/modules/video_output/caopengllayer.m
+++ b/modules/video_output/caopengllayer.m
@@ -364,7 +364,7 @@ static int Control (vout_display_t *vd, int query, va_list 
ap)
             return VLC_SUCCESS;
         }
 
-        case VOUT_DISPLAY_HIDE_MOUSE:
+        case VOUT_DISPLAY_HIDE_MOUSE: /* FIXME: dead code */
         {
             [NSCursor setHiddenUntilMouseMoves: YES];
             return VLC_SUCCESS;
diff --git a/modules/video_output/evas.c b/modules/video_output/evas.c
index 66daaea86b..36afcfd3e3 100644
--- a/modules/video_output/evas.c
+++ b/modules/video_output/evas.c
@@ -782,7 +782,6 @@ Control( vout_display_t *vd, int i_query, va_list ap )
     case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
     case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
     case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
-    case VOUT_DISPLAY_HIDE_MOUSE:
         return VLC_EGENERIC;
     default:
         msg_Warn( vd, "Unknown request in evas_output" );
diff --git a/modules/video_output/flaschen.c b/modules/video_output/flaschen.c
index 795e02d4db..cf4c79b61c 100644
--- a/modules/video_output/flaschen.c
+++ b/modules/video_output/flaschen.c
@@ -239,10 +239,6 @@ static int Control(vout_display_t *vd, int query, va_list 
args)
     case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
         return VLC_EGENERIC;
 
-    case VOUT_DISPLAY_HIDE_MOUSE:
-        /* not really working */
-        return VLC_SUCCESS;
-
     default:
         msg_Err(vd, "Unsupported query in vout display flaschen");
         return VLC_EGENERIC;
diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m
index b0333800ab..81b42c7cd0 100644
--- a/modules/video_output/ios.m
+++ b/modules/video_output/ios.m
@@ -283,9 +283,6 @@ static int Control(vout_display_t *vd, int query, va_list 
ap)
     vout_display_sys_t *sys = vd->sys;
 
     switch (query) {
-        case VOUT_DISPLAY_HIDE_MOUSE:
-            return VLC_EGENERIC;
-
         case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
         case VOUT_DISPLAY_CHANGE_ZOOM:
         case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 9823809a97..6e43307af8 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -411,7 +411,7 @@ static int Control (vout_display_t *vd, int query, va_list 
ap)
                 return VLC_SUCCESS;
             }
 
-            case VOUT_DISPLAY_HIDE_MOUSE:
+            case VOUT_DISPLAY_HIDE_MOUSE: /* FIXME: dead code */
             {
                 [NSCursor setHiddenUntilMouseMoves: YES];
                 return VLC_SUCCESS;
diff --git a/modules/video_output/opengl/display.c 
b/modules/video_output/opengl/display.c
index c375302efe..2288987469 100644
--- a/modules/video_output/opengl/display.c
+++ b/modules/video_output/opengl/display.c
@@ -204,8 +204,6 @@ static int Control (vout_display_t *vd, int query, va_list 
ap)
 
     switch (query)
     {
-      case VOUT_DISPLAY_HIDE_MOUSE: /* FIXME TODO */
-        break;
 #ifndef NDEBUG
       case VOUT_DISPLAY_RESET_PICTURES: // not needed
         vlc_assert_unreachable();
diff --git a/modules/video_output/wayland/shm.c 
b/modules/video_output/wayland/shm.c
index 053559a5cd..e1eedb6a2f 100644
--- a/modules/video_output/wayland/shm.c
+++ b/modules/video_output/wayland/shm.c
@@ -259,10 +259,6 @@ static int Control(vout_display_t *vd, int query, va_list 
ap)
 
     switch (query)
     {
-        case VOUT_DISPLAY_HIDE_MOUSE:
-            /* TODO */
-            return VLC_EGENERIC;
-
         case VOUT_DISPLAY_RESET_PICTURES:
         {
             vout_display_place_t place;
diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c
index 3009e4daa4..4c633174a6 100644
--- a/modules/video_output/xcb/x11.c
+++ b/modules/video_output/xcb/x11.c
@@ -504,9 +504,6 @@ static int Control (vout_display_t *vd, int query, va_list 
ap)
         return VLC_SUCCESS;
     }
 
-    case VOUT_DISPLAY_HIDE_MOUSE:
-        return VLC_EGENERIC;
-
     default:
         msg_Err (vd, "Unknown request in XCB vout display");
         return VLC_EGENERIC;
diff --git a/modules/video_output/xcb/xvideo.c 
b/modules/video_output/xcb/xvideo.c
index c759627b7e..73f41479a3 100644
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -750,8 +750,6 @@ static int Control (vout_display_t *vd, int query, va_list 
ap)
         return VLC_SUCCESS;
     }
 
-    case VOUT_DISPLAY_HIDE_MOUSE:
-        return VLC_EGENERIC;
     case VOUT_DISPLAY_RESET_PICTURES:
         vlc_assert_unreachable();
     default:

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to