[vlc-devel] [PATCH 07/13] vout: move gl.c to opengl/display.c

[Thomas Guillem]

---
 modules/video_output/Makefile.am                | 4 ++--
 modules/video_output/{gl.c => opengl/display.c} | 4 ++--
 po/POTFILES.in                                  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename modules/video_output/{gl.c => opengl/display.c} (99%)

diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 702e348..d07fad4 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -35,7 +35,7 @@ vout_LTLIBRARIES += libvout_ios2_plugin.la
 endif
 
 ### OpenGL ###
-libgles2_plugin_la_SOURCES = $(OPENGL_DISPLAY_SOURCES) video_output/gl.c
+libgles2_plugin_la_SOURCES = $(OPENGL_DISPLAY_SOURCES) video_output/opengl/display.c
 libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES2
 libgles2_plugin_la_LIBADD = $(GLES2_LIBS) $(LIBM)
 libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
@@ -43,7 +43,7 @@ libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
 EXTRA_LTLIBRARIES += libgles2_plugin.la
 vout_LTLIBRARIES += $(LTLIBgles2)
 
-libgl_plugin_la_SOURCES = $(OPENGL_DISPLAY_SOURCES) video_output/gl.c
+libgl_plugin_la_SOURCES = $(OPENGL_DISPLAY_SOURCES) video_output/opengl/display.c
 libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
 libgl_plugin_la_LIBADD = $(GL_LIBS) $(LIBM)
 if HAVE_GL
diff --git a/modules/video_output/gl.c b/modules/video_output/opengl/display.c
similarity index 99%
rename from modules/video_output/gl.c
rename to modules/video_output/opengl/display.c
index 4146b80..eefb5cf 100644
--- a/modules/video_output/gl.c
+++ b/modules/video_output/opengl/display.c
@@ -1,5 +1,5 @@
 /**
- * @file gl.c
+ * @file display.c
  * @brief OpenGL video output module
  */
 /*****************************************************************************
@@ -31,7 +31,7 @@
 #include <vlc_plugin.h>
 #include <vlc_vout_display.h>
 #include <vlc_opengl.h>
-#include "opengl/vout_helper.h"
+#include "vout_helper.h"
 
 /* Plugin callbacks */
 static int Open (vlc_object_t *);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9b4acae..27cfa85 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1147,11 +1147,11 @@ modules/video_output/drawable.c
 modules/video_output/evas.c
 modules/video_output/egl.c
 modules/video_output/fb.c
-modules/video_output/gl.c
 modules/video_output/glx.c
 modules/video_output/ios2.m
 modules/video_output/kva.c
 modules/video_output/macosx.m
+modules/video_output/opengl/display.c
 modules/video_output/win32/direct3d9.c
 modules/video_output/win32/direct3d11.c
 modules/video_output/win32/directdraw.c
-- 
2.10.2