[vlc-commits] video_output: rename android_native_window to android-window

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri May 27 17:43:43 2016 +0200| [5d175d23debc71f143400c92efee3d46622d3dc9] | committer: Thomas Guillem

video_output: rename android_native_window to android-window

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

 modules/video_output/Makefile.am                          | 8 ++++----
 modules/video_output/android/{nativewindow.c => window.c} | 6 +++---
 po/POTFILES.in                                            | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index d1bb161..d11412e 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -272,10 +272,10 @@ libegl_android_plugin_la_SOURCES = video_output/egl.c
 libegl_android_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS) -DUSE_PLATFORM_ANDROID=1
 libegl_android_plugin_la_LIBADD = $(EGL_LIBS)
 
-libandroid_native_window_plugin_la_SOURCES = video_output/android/nativewindow.c \
+libandroid_window_plugin_la_SOURCES = video_output/android/window.c \
 	video_output/android/utils.c video_output/android/utils.h
-libandroid_native_window_plugin_la_CFLAGS = $(AM_CFLAGS)
-libandroid_native_window_plugin_la_LIBADD = $(LIBDL)
+libandroid_window_plugin_la_CFLAGS = $(AM_CFLAGS)
+libandroid_window_plugin_la_LIBADD = $(LIBDL)
 
 libandroid_display_plugin_la_SOURCES = video_output/android/display.c \
 	video_output/android/display.h \
@@ -284,7 +284,7 @@ libandroid_display_plugin_la_CFLAGS = $(AM_CFLAGS)
 libandroid_display_plugin_la_LIBADD = $(LIBDL)
 
 if HAVE_ANDROID
-vout_LTLIBRARIES += libandroid_native_window_plugin.la libandroid_display_plugin.la
+vout_LTLIBRARIES += libandroid_window_plugin.la libandroid_display_plugin.la
 if HAVE_EGL
 vout_LTLIBRARIES += libegl_android_plugin.la
 endif
diff --git a/modules/video_output/android/nativewindow.c b/modules/video_output/android/window.c
similarity index 97%
rename from modules/video_output/android/nativewindow.c
rename to modules/video_output/android/window.c
index 85a33c6..bc517c1 100644
--- a/modules/video_output/android/nativewindow.c
+++ b/modules/video_output/android/window.c
@@ -1,5 +1,5 @@
 /**
- * @file androidnativewindow.c
+ * @file window.c
  * @brief Android native window provider module for VLC media player
  */
 /*****************************************************************************
@@ -37,7 +37,7 @@
 
 #include "utils.h"
 
-#define THREAD_NAME "ANativeWindow"
+#define THREAD_NAME "Android Window"
 
 static int Open(vout_window_t *, const vout_window_cfg_t *);
 static void Close(vout_window_t *);
@@ -47,7 +47,7 @@ static int Control(vout_window_t *, int, va_list ap);
  * Module descriptor
  */
 vlc_module_begin()
-    set_shortname(N_("ANativeWindow"))
+    set_shortname(N_("Android Window"))
     set_description(N_("Android native window"))
     set_category(CAT_VIDEO)
     set_subcategory(SUBCAT_VIDEO_VOUT)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index db8d119..2be9157 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1141,7 +1141,7 @@ modules/video_filter/vhs.c
 modules/video_filter/wave.c
 modules/video_output/aa.c
 modules/video_output/android/display.c
-modules/video_output/android/nativewindow.c
+modules/video_output/android/window.c
 modules/video_output/caca.c
 modules/video_output/caopengllayer.m
 modules/video_output/decklink.cpp