[vlc-commits] vout: remove no longer used VOUT_DISPLAY_GET_OPENGL

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Oct 13 19:41:48 2014 +0300| [e83fa9c21ab6da1b584e84907c721bc65d5e7cc6] | committer: Rémi Denis-Courmont

vout: remove no longer used VOUT_DISPLAY_GET_OPENGL

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

 include/vlc_vout_display.h         |    3 ---
 include/vlc_vout_wrapper.h         |    3 ---
 modules/video_output/gl.c          |    9 ---------
 modules/video_output/msw/glwin32.c |   18 +-----------------
 modules/video_output/xcb/glx.c     |    7 -------
 src/libvlccore.sym                 |    1 -
 src/video_output/display.c         |    8 --------
 7 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index 6771b53..939e4e2 100644
--- 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 f835c41..bf49dfd 100644
--- 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 0e83d63..d6e00d1 100644
--- 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 489581b..89f2d7d 100644
--- 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 27a3875..ced6a17 100644
--- 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 e3a90e6..fc45e83 100644
--- 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 c485413..f18a15c 100644
--- 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,