[vlc-commits] vout: remove unreachable GET_OPENGL controls

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Oct 12 19:42:46 2014 +0300| [9ad0b1735ec1e81578ab1807501758616c0b6777] | committer: Rémi Denis-Courmont

vout: remove unreachable GET_OPENGL controls

This control is only useful if the video output is called "opengl".

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

 modules/video_output/caopengllayer.m |    6 ------
 modules/video_output/gl.c            |    4 ++--
 modules/video_output/ios2.m          |    7 -------
 modules/video_output/macosx.m        |    7 -------
 4 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/modules/video_output/caopengllayer.m b/modules/video_output/caopengllayer.m
index 0fea9a5..713edb9 100644
--- a/modules/video_output/caopengllayer.m
+++ b/modules/video_output/caopengllayer.m
@@ -334,12 +334,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
             return VLC_SUCCESS;
         }
 
-        case VOUT_DISPLAY_GET_OPENGL:
-        {
-            vlc_gl_t **gl = va_arg (ap, vlc_gl_t **);
-            *gl = &sys->gl;
-            return VLC_SUCCESS;
-        }
         case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
         {
             return VLC_SUCCESS;
diff --git a/modules/video_output/gl.c b/modules/video_output/gl.c
index 74c8752..21bbc56 100644
--- a/modules/video_output/gl.c
+++ b/modules/video_output/gl.c
@@ -272,7 +272,7 @@ static int Control (vout_display_t *vd, int query, va_list ap)
         vlc_gl_ReleaseCurrent (sys->gl);
         return VLC_SUCCESS;
       }
-
+#if !USE_OPENGL_ES
       case VOUT_DISPLAY_GET_OPENGL:
       {
         vlc_gl_t **pgl = va_arg (ap, vlc_gl_t **);
@@ -280,7 +280,7 @@ static int Control (vout_display_t *vd, int query, va_list ap)
         *pgl = sys->gl;
         return VLC_SUCCESS;
       }
-
+#endif
       default:
         msg_Err (vd, "Unknown request %d", query);
     }
diff --git a/modules/video_output/ios2.m b/modules/video_output/ios2.m
index e58abb0..b90d693 100644
--- a/modules/video_output/ios2.m
+++ b/modules/video_output/ios2.m
@@ -314,13 +314,6 @@ static int Control(vout_display_t *vd, int query, va_list ap)
             return VLC_SUCCESS;
         }
 
-        case VOUT_DISPLAY_GET_OPENGL:
-        {
-            vlc_gl_t **gl = va_arg(ap, vlc_gl_t **);
-            *gl = &sys->gl;
-            return VLC_SUCCESS;
-        }
-
         case VOUT_DISPLAY_RESET_PICTURES:
             assert (0);
         default:
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 02cdbd7..aab54cb 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -384,13 +384,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
             return VLC_SUCCESS;
         }
 
-        case VOUT_DISPLAY_GET_OPENGL:
-        {
-            vlc_gl_t **gl = va_arg (ap, vlc_gl_t **);
-            *gl = &sys->gl;
-            return VLC_SUCCESS;
-        }
-
         case VOUT_DISPLAY_RESET_PICTURES:
             assert (0);
         default: