vout: remove no longer used VOUT_DISPLAY_GET_OPENGL

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index 6771b53dd91cbfcacd37567a89c47994a27c7771..939e4e25d2eaf93ec264b150b61b78b490da8eed 100644 (file)
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -170,9 +170,6 @@ enum {
      * The cropping requested is stored by video_format_t::i_x/y_offset and
      * video_format_t::i_visible_width/height */
     VOUT_DISPLAY_CHANGE_SOURCE_CROP,   /* const video_format_t *p_source */
-
-    /* Ask an opengl interface if available. */
-    VOUT_DISPLAY_GET_OPENGL,           /* vlc_gl_t ** */
 };
 
 /**

diff --git a/include/vlc_vout_wrapper.h b/include/vlc_vout_wrapper.h
index f835c4164acea93d5869a0624eeb45093749ca94..bf49dfda2a5046eafe6238349e88b6caa53c4313 100644 (file)
--- a/include/vlc_vout_wrapper.h
+++ b/include/vlc_vout_wrapper.h
@@ -92,8 +92,5 @@ VLC_API void vout_SetDisplayZoom(vout_display_t *, unsigned num, unsigned den);
 VLC_API void vout_SetDisplayAspect(vout_display_t *, unsigned dar_num, unsigned dar_den);
 VLC_API void vout_SetDisplayCrop(vout_display_t *, unsigned crop_num, unsigned crop_den, unsigned left, unsigned top, int right, int bottom);
 
-struct vlc_gl_t;
-VLC_API struct vlc_gl_t * vout_GetDisplayOpengl(vout_display_t *);
-
 #endif /* VLC_VOUT_WRAPPER_H */
 

diff --git a/modules/video_output/gl.c b/modules/video_output/gl.c
index 0e83d6384bc4d6d1f496c0907520805a4387354d..d6e00d1e00990bf9eb7df4e265823fcfaf3e5088 100644 (file)
--- a/modules/video_output/gl.c
+++ b/modules/video_output/gl.c
@@ -267,15 +267,6 @@ 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 **);
-
-        *pgl = sys->gl;
-        return VLC_SUCCESS;
-      }
-#endif
       default:
         msg_Err (vd, "Unknown request %d", query);
     }

diff --git a/modules/video_output/msw/glwin32.c b/modules/video_output/msw/glwin32.c
index 489581bfd29279bf876f99f0c59cdd6b4ca454cb..89f2d7d41d4383573ad85c10a038a96ba01bf398 100644 (file)
--- a/modules/video_output/msw/glwin32.c
+++ b/modules/video_output/msw/glwin32.c
@@ -63,7 +63,6 @@ vlc_module_end()
 static picture_pool_t *Pool  (vout_display_t *, unsigned);
 static void           Prepare(vout_display_t *, picture_t *, subpicture_t *);
 static void           Display(vout_display_t *, picture_t *, subpicture_t *);
-static int            Control(vout_display_t *, int, va_list);
 static void           Manage (vout_display_t *);
 
 static void           Swap   (vlc_gl_t *);
@@ -230,7 +229,7 @@ static int Open(vlc_object_t *object)
     vd->pool    = Pool;
     vd->prepare = Prepare;
     vd->display = Display;
-    vd->control = Control;
+    vd->control = CommonControl;
     vd->manage  = Manage;
 
     return VLC_SUCCESS;
@@ -294,21 +293,6 @@ static void Display(vout_display_t *vd, picture_t *picture, subpicture_t *subpic
     CommonDisplay(vd);
 }
 
-static int Control(vout_display_t *vd, int query, va_list args)
-{
-    switch (query) {
-    case VOUT_DISPLAY_GET_OPENGL: {
-        vlc_gl_t **gl = va_arg(args, vlc_gl_t **);
-        *gl = &vd->sys->gl;
-
-        CommonDisplay(vd);
-        return VLC_SUCCESS;
-    }
-    default:
-        return CommonControl(vd, query, args);
-    }
-}
-
 static void Manage (vout_display_t *vd)
 {
     vout_display_sys_t *sys = vd->sys;

diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c
index 27a3875beeee5328e2473a042989ff85ac511b17..ced6a177ff4323fa82ccd0fbb0cdcdbf283adb02 100644 (file)
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -247,13 +247,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
         xcb_flush (sys->conn);
         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/src/libvlccore.sym b/src/libvlccore.sym
index e3a90e6e7f3f1e8d845d34ae4cc88d6364f6a844..fc45e832d53dabe190bd870123bcbc7d139b8042 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -637,7 +637,6 @@ vout_AreDisplayPicturesInvalid
 vout_IsDisplayFiltered
 vout_FilterDisplay
 vout_ManageDisplay
-vout_GetDisplayOpengl
 vout_SetDisplayFullscreen
 vout_SetDisplayFilled
 vout_SetDisplayZoom

diff --git a/src/video_output/display.c b/src/video_output/display.c
index c4854133b097d1098a069aa84cecd617a60f31e6..f18a15ce89535e15f7e9fb445ded504866005a8a 100644 (file)
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -1270,14 +1270,6 @@ void vout_SetDisplayCrop(vout_display_t *vd,
     }
 }
 
-struct vlc_gl_t *vout_GetDisplayOpengl(vout_display_t *vd)
-{
-    struct vlc_gl_t *gl;
-    if (vout_display_Control(vd, VOUT_DISPLAY_GET_OPENGL, &gl))
-        return NULL;
-    return gl;
-}
-
 static vout_display_t *DisplayNew(vout_thread_t *vout,
                                   const video_format_t *source,
                                   const vout_display_state_t *state,