[vlc-commits] opengl: rename "glconv" capability to "glinterop"

[Romain Vimont]

vlc | branch: master | Romain Vimont <rom1v at videolabs.io> | Mon Jan  6 16:53:07 2020 +0100| [46650ad3f7f92d2757c43b42aa170965dc1df25c] | committer: Thomas Guillem

opengl: rename "glconv" capability to "glinterop"

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

 modules/hw/nvdec/nvdec_gl.c                   | 2 +-
 modules/video_output/opengl/interop_android.c | 2 +-
 modules/video_output/opengl/interop_cvpx.c    | 2 +-
 modules/video_output/opengl/interop_vaapi.c   | 2 +-
 modules/video_output/opengl/interop_vdpau.c   | 2 +-
 modules/video_output/opengl/vout_helper.c     | 2 +-
 modules/video_output/opengl/vout_helper.h     | 8 ++++----
 modules/video_output/win32/direct3d9.c        | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/hw/nvdec/nvdec_gl.c b/modules/hw/nvdec/nvdec_gl.c
index af766f5e95..4a8408d7ed 100644
--- a/modules/hw/nvdec/nvdec_gl.c
+++ b/modules/hw/nvdec/nvdec_gl.c
@@ -48,7 +48,7 @@ static void Close(vlc_object_t *);
 
 vlc_module_begin ()
     set_description("NVDEC OpenGL surface converter")
-    set_capability("glconv", 2)
+    set_capability("glinterop", 2)
     set_callbacks(Open, Close)
     set_category(CAT_VIDEO)
     set_subcategory(SUBCAT_VIDEO_VOUT)
diff --git a/modules/video_output/opengl/interop_android.c b/modules/video_output/opengl/interop_android.c
index 80297f12ce..4f9dcdb618 100644
--- a/modules/video_output/opengl/interop_android.c
+++ b/modules/video_output/opengl/interop_android.c
@@ -182,7 +182,7 @@ Open(vlc_object_t *obj)
 
 vlc_module_begin ()
     set_description("Android OpenGL SurfaceTexture converter")
-    set_capability("glconv", 1)
+    set_capability("glinterop", 1)
     set_callbacks(Open, Close)
     set_category(CAT_VIDEO)
     set_subcategory(SUBCAT_VIDEO_VOUT)
diff --git a/modules/video_output/opengl/interop_cvpx.c b/modules/video_output/opengl/interop_cvpx.c
index 80d2104a35..48bddb2473 100644
--- a/modules/video_output/opengl/interop_cvpx.c
+++ b/modules/video_output/opengl/interop_cvpx.c
@@ -291,7 +291,7 @@ error:
 
 vlc_module_begin ()
     set_description("Apple OpenGL CVPX converter")
-    set_capability("glconv", 1)
+    set_capability("glinterop", 1)
     set_callbacks(Open, Close)
     set_category(CAT_VIDEO)
     set_subcategory(SUBCAT_VIDEO_VOUT)
diff --git a/modules/video_output/opengl/interop_vaapi.c b/modules/video_output/opengl/interop_vaapi.c
index a862868837..7dcbd52124 100644
--- a/modules/video_output/opengl/interop_vaapi.c
+++ b/modules/video_output/opengl/interop_vaapi.c
@@ -426,7 +426,7 @@ error:
 
 vlc_module_begin ()
     set_description("VA-API OpenGL surface converter")
-    set_capability("glconv", 1)
+    set_capability("glinterop", 1)
     set_callbacks(Open, Close)
     set_category(CAT_VIDEO)
     set_subcategory(SUBCAT_VIDEO_VOUT)
diff --git a/modules/video_output/opengl/interop_vdpau.c b/modules/video_output/opengl/interop_vdpau.c
index 2b257f0a64..dbffe81926 100644
--- a/modules/video_output/opengl/interop_vdpau.c
+++ b/modules/video_output/opengl/interop_vdpau.c
@@ -229,7 +229,7 @@ DecoderDeviceOpen(vlc_decoder_device *device, vout_window_t *window)
 
 vlc_module_begin ()
     set_description("VDPAU OpenGL surface converter")
-    set_capability("glconv", 2)
+    set_capability("glinterop", 2)
     set_callbacks(Open, Close)
     set_category(CAT_VIDEO)
     set_subcategory(SUBCAT_VIDEO_VOUT)
diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
index 59a77b71f6..af2fd80bc0 100644
--- a/modules/video_output/opengl/vout_helper.c
+++ b/modules/video_output/opengl/vout_helper.c
@@ -611,7 +611,7 @@ opengl_init_program(vout_display_opengl_t *vgl, vlc_video_context *context,
         {
             /* Opaque chroma: load a module to handle it */
             interop->vctx = context;
-            interop->module = module_need_var(interop, "glconv", "glconv");
+            interop->module = module_need_var(interop, "glinterop", "glinterop");
         }
 
         if (interop->module != NULL)
diff --git a/modules/video_output/opengl/vout_helper.h b/modules/video_output/opengl/vout_helper.h
index 09b9e6bea1..72895f8747 100644
--- a/modules/video_output/opengl/vout_helper.h
+++ b/modules/video_output/opengl/vout_helper.h
@@ -76,12 +76,12 @@
 #define add_glopts_placebo()
 #endif
 
-#define GLCONV_TEXT N_("Open GL/GLES hardware converter")
-#define GLCONV_LONGTEXT N_( \
-    "Force a \"glconv\" module.")
+#define GLINTEROP_TEXT N_("Open GL/GLES hardware interop")
+#define GLINTEROP_LONGTEXT N_( \
+    "Force a \"glinterop\" module.")
 
 #define add_glopts() \
-    add_module("glconv", "glconv", NULL, GLCONV_TEXT, GLCONV_LONGTEXT) \
+    add_module("glinterop", "glinterop", NULL, GLINTEROP_TEXT, GLINTEROP_LONGTEXT) \
     add_glopts_placebo ()
 
 typedef struct vout_display_opengl_t vout_display_opengl_t;
diff --git a/modules/video_output/win32/direct3d9.c b/modules/video_output/win32/direct3d9.c
index 2497bcbd91..876c2ace46 100644
--- a/modules/video_output/win32/direct3d9.c
+++ b/modules/video_output/win32/direct3d9.c
@@ -115,7 +115,7 @@ vlc_module_begin ()
 #ifdef HAVE_GL
     add_submodule()
     set_description("DX OpenGL surface converter for D3D9")
-    set_capability("glconv", 1)
+    set_capability("glinterop", 1)
     set_callbacks(GLConvOpen, GLConvClose)
 #endif
 vlc_module_end ()