[vlc-commits] wayland: rename wl_shell_surface to wl_shell

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jan 29 16:03:36 2017 +0200| [d3986cc50b0478f54e4774129b872b6d45087b6f] | committer: Rémi Denis-Courmont

wayland: rename wl_shell_surface to wl_shell

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

 modules/MODULES_LIST                                      | 2 +-
 modules/video_output/Makefile.am                          | 8 ++++----
 modules/video_output/wayland/{shell_surface.c => shell.c} | 2 +-
 po/POTFILES.in                                            | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST
index 6c1c42b..8b784f9 100644
--- a/modules/MODULES_LIST
+++ b/modules/MODULES_LIST
@@ -455,7 +455,7 @@ $Id$
  * wingdi: WIN 32 / WIN CE GDI video output
  * winstore: Windows Store App audio output
  * wl_screenshooter: Wayland screen capture input
- * wl_shell_surface: Wayland shell surface window provider
+ * wl_shell: Wayland shell surface window provider
  * wl_shm: Wayland shared memory video output
  * wma_fixed: wma decoder using integer decoder from Rockbox
  * x262: MPEG-2 video encoder using x262
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 7223479..8aad1b7 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -137,9 +137,9 @@ video_output/wayland/viewporter-protocol.c: \
 		$(WAYLAND_PROTOCOLS)/stable/viewporter/viewporter.xml
 	$(AM_V_GEN)$(WAYLAND_SCANNER) code $< $@
 
-libwl_shell_surface_plugin_la_SOURCES = video_output/wayland/shell_surface.c
-libwl_shell_surface_plugin_la_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)
-libwl_shell_surface_plugin_la_LIBADD = $(WAYLAND_CLIENT_LIBS) $(LIBPTHREAD)
+libwl_shell_plugin_la_SOURCES = video_output/wayland/shell.c
+libwl_shell_plugin_la_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)
+libwl_shell_plugin_la_LIBADD = $(WAYLAND_CLIENT_LIBS) $(LIBPTHREAD)
 
 libegl_wl_plugin_la_SOURCES = video_output/opengl/egl.c
 libegl_wl_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_PLATFORM_WAYLAND=1
@@ -149,7 +149,7 @@ libegl_wl_plugin_la_LIBADD = $(EGL_LIBS) $(WAYLAND_EGL_LIBS)
 if HAVE_WAYLAND
 BUILT_SOURCES += $(nodist_libwl_shm_plugin_la_SOURCES)
 vout_LTLIBRARIES += libwl_shm_plugin.la
-vout_LTLIBRARIES += libwl_shell_surface_plugin.la
+vout_LTLIBRARIES += libwl_shell_plugin.la
 if HAVE_WAYLAND_EGL
 if HAVE_EGL
 vout_LTLIBRARIES += libegl_wl_plugin.la
diff --git a/modules/video_output/wayland/shell_surface.c b/modules/video_output/wayland/shell.c
similarity index 99%
rename from modules/video_output/wayland/shell_surface.c
rename to modules/video_output/wayland/shell.c
index c91476e..0ff38b9 100644
--- a/modules/video_output/wayland/shell_surface.c
+++ b/modules/video_output/wayland/shell.c
@@ -1,5 +1,5 @@
 /**
- * @file shell_surface.c
+ * @file shell.c
  * @brief Wayland shell surface provider module for VLC media player
  */
 /*****************************************************************************
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 68010c7..e1ff28a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1147,7 +1147,7 @@ modules/video_output/win32/wingdi.c
 modules/video_output/sdl.c
 modules/video_output/vdummy.c
 modules/video_output/vmem.c
-modules/video_output/wayland/shell_surface.c
+modules/video_output/wayland/shell.c
 modules/video_output/wayland/shm.c
 modules/video_output/xcb/window.c
 modules/video_output/xcb/x11.c