[vlc-commits] opengl: rename add_glconv to add_glopts

[Thomas Guillem]

vlc/vlc-3.0 | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Jan  3 09:42:58 2018 +0100| [6c04499e88c6229287c66d033dca88b04274634f] | committer: Jean-Baptiste Kempf

opengl: rename add_glconv to add_glopts

(cherry picked from commit d20c08ec73eb1d3a4f5ed0c9c08bf7d2ec9ec515)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/video_output/ios.m                | 2 +-
 modules/video_output/macosx.m             | 2 +-
 modules/video_output/opengl/display.c     | 2 +-
 modules/video_output/opengl/vout_helper.h | 3 ++-
 modules/video_output/win32/glwin32.c      | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m
index c7606c2f13..655381a8b0 100644
--- a/modules/video_output/ios.m
+++ b/modules/video_output/ios.m
@@ -82,7 +82,7 @@ vlc_module_begin ()
     set_callbacks(Open, Close)
 
     add_shortcut("vout_ios2", "vout_ios")
-    add_glconv()
+    add_glopts()
 vlc_module_end ()
 
 @interface VLCOpenGLES2VideoView : UIView {
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 4fae00d4de..4a73950ff6 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -78,7 +78,7 @@ vlc_module_begin ()
     set_capability ("vout display", 300)
     set_callbacks (Open, Close)
     add_shortcut ("macosx", "vout_macosx")
-    add_glconv ()
+    add_glopts ()
 vlc_module_end ()
 
 /**
diff --git a/modules/video_output/opengl/display.c b/modules/video_output/opengl/display.c
index 2ecdd0caaa..a681760df2 100644
--- a/modules/video_output/opengl/display.c
+++ b/modules/video_output/opengl/display.c
@@ -68,7 +68,7 @@ vlc_module_begin ()
     add_module ("gl", "opengl", NULL,
                 GL_TEXT, PROVIDER_LONGTEXT, true)
 #endif
-    add_glconv ()
+    add_glopts ()
 vlc_module_end ()
 
 struct vout_display_sys_t
diff --git a/modules/video_output/opengl/vout_helper.h b/modules/video_output/opengl/vout_helper.h
index 666dd79291..939a000d2e 100644
--- a/modules/video_output/opengl/vout_helper.h
+++ b/modules/video_output/opengl/vout_helper.h
@@ -61,7 +61,8 @@
 #define GLCONV_TEXT N_("Open GL/GLES hardware converter")
 #define GLCONV_LONGTEXT N_( \
     "Force a \"glconv\" module.")
-#define add_glconv() add_module ("glconv", "glconv", NULL, GLCONV_TEXT, GLCONV_LONGTEXT, true)
+#define add_glopts() \
+    add_module ("glconv", "glconv", NULL, GLCONV_TEXT, GLCONV_LONGTEXT, true)
 
 static const vlc_fourcc_t gl_subpicture_chromas[] = {
     VLC_CODEC_RGBA,
diff --git a/modules/video_output/win32/glwin32.c b/modules/video_output/win32/glwin32.c
index 07195e55c1..521270bad1 100644
--- a/modules/video_output/win32/glwin32.c
+++ b/modules/video_output/win32/glwin32.c
@@ -52,7 +52,7 @@ vlc_module_begin()
     set_capability("vout display", 275)
     add_shortcut("glwin32", "opengl")
     set_callbacks(Open, Close)
-    add_glconv()
+    add_glopts()
 vlc_module_end()
 
 /*****************************************************************************