[vlc-devel] [PATCH v2 17/21] opengl: rename converter_*.c to interop_*.c

[Romain Vimont]

The "converter" modules are now only "interop" modules.
---
 modules/video_output/Makefile.am              | 20 +++++++++----------
 ...{converter_android.c => interop_android.c} |  0
 .../{converter_cvpx.c => interop_cvpx.c}      |  0
 .../opengl/{converter_sw.c => interop_sw.c}   |  0
 .../{converter_vaapi.c => interop_vaapi.c}    |  0
 .../{converter_vdpau.c => interop_vdpau.c}    |  0
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename modules/video_output/opengl/{converter_android.c => interop_android.c} (100%)
 rename modules/video_output/opengl/{converter_cvpx.c => interop_cvpx.c} (100%)
 rename modules/video_output/opengl/{converter_sw.c => interop_sw.c} (100%)
 rename modules/video_output/opengl/{converter_vaapi.c => interop_vaapi.c} (100%)
 rename modules/video_output/opengl/{converter_vdpau.c => interop_vdpau.c} (100%)

diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 3c1bee98cb..7d0bfbdd1f 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -4,10 +4,10 @@ vout_LTLIBRARIES =
 EXTRA_DIST += video_output/README
 
 OPENGL_COMMONSOURCES = video_output/opengl/vout_helper.c \
-	video_output/opengl/gl_common.h \
+	video_output/opengl/gl_common.h video_output/opengl/interop.h \
 	video_output/opengl/vout_helper.h video_output/opengl/converter.h \
 	video_output/opengl/internal.h video_output/opengl/fragment_shaders.c \
-	video_output/opengl/converter_sw.c
+	video_output/opengl/interop_sw.c
 if HAVE_LIBPLACEBO
 OPENGL_COMMONSOURCES += video_output/placebo_utils.c video_output/placebo_utils.h
 endif
@@ -30,8 +30,8 @@ libdecklinkoutput_plugin_la_LIBADD = $(LIBS_decklink) $(LIBDL) -lpthread
 vout_LTLIBRARIES += libdecklinkoutput_plugin.la
 endif
 
-libglconv_cvpx_plugin_la_SOURCES = video_output/opengl/converter_cvpx.c \
-	video_output/opengl/converter.h
+libglconv_cvpx_plugin_la_SOURCES = video_output/opengl/interop_cvpx.c \
+	video_output/opengl/interop.h
 libglconv_cvpx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
 
 if HAVE_OSX
@@ -86,14 +86,14 @@ libgl_plugin_la_CFLAGS += -DHAVE_GL_CORE_SYMBOLS
 libgl_plugin_la_LIBADD += $(GL_LIBS)
 endif
 
-libglconv_vaapi_plugin_la_SOURCES = video_output/opengl/converter_vaapi.c \
-	video_output/opengl/converter.h \
+libglconv_vaapi_plugin_la_SOURCES = video_output/opengl/interop_vaapi.c \
+	video_output/opengl/interop.h \
 	hw/vaapi/vlc_vaapi.c hw/vaapi/vlc_vaapi.h
 libglconv_vaapi_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
 libglconv_vaapi_plugin_la_LIBADD = $(LIBVA_LIBS) $(LIBVA_EGL_LIBS)
 
-libglconv_vdpau_plugin_la_SOURCES = video_output/opengl/converter_vdpau.c \
-	video_output/opengl/converter.h hw/vdpau/picture.c hw/vdpau/vlc_vdpau.h
+libglconv_vdpau_plugin_la_SOURCES = video_output/opengl/interop_vdpau.c \
+	video_output/opengl/interop.h hw/vdpau/picture.c hw/vdpau/vlc_vdpau.h
 libglconv_vdpau_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS)
 libglconv_vdpau_plugin_la_LIBADD = $(LIBDL) libvlc_vdpau.la $(X_LIBS) $(X_PRE_LIBS) -lX11
 
@@ -279,8 +279,8 @@ libandroid_display_plugin_la_SOURCES = video_output/android/display.c \
 libandroid_display_plugin_la_CFLAGS = $(AM_CFLAGS)
 libandroid_display_plugin_la_LIBADD = $(LIBDL)
 
-libglconv_android_plugin_la_SOURCES = video_output/opengl/converter_android.c \
-	video_output/opengl/converter.h
+libglconv_android_plugin_la_SOURCES = video_output/opengl/interop_android.c \
+	video_output/opengl/interop.h
 libglconv_android_plugin_la_CFLAGS = $(AM_CFLAGS) -DUSE_OPENGL_ES2
 
 if HAVE_ANDROID
diff --git a/modules/video_output/opengl/converter_android.c b/modules/video_output/opengl/interop_android.c
similarity index 100%
rename from modules/video_output/opengl/converter_android.c
rename to modules/video_output/opengl/interop_android.c
diff --git a/modules/video_output/opengl/converter_cvpx.c b/modules/video_output/opengl/interop_cvpx.c
similarity index 100%
rename from modules/video_output/opengl/converter_cvpx.c
rename to modules/video_output/opengl/interop_cvpx.c
diff --git a/modules/video_output/opengl/converter_sw.c b/modules/video_output/opengl/interop_sw.c
similarity index 100%
rename from modules/video_output/opengl/converter_sw.c
rename to modules/video_output/opengl/interop_sw.c
diff --git a/modules/video_output/opengl/converter_vaapi.c b/modules/video_output/opengl/interop_vaapi.c
similarity index 100%
rename from modules/video_output/opengl/converter_vaapi.c
rename to modules/video_output/opengl/interop_vaapi.c
diff --git a/modules/video_output/opengl/converter_vdpau.c b/modules/video_output/opengl/interop_vdpau.c
similarity index 100%
rename from modules/video_output/opengl/converter_vdpau.c
rename to modules/video_output/opengl/interop_vdpau.c
-- 
2.25.0.rc0