wayland: rename wl_shell_surface to wl_shell

This commit is contained in:
Rémi Denis-Courmont 2017-01-29 16:03:36 +02:00
parent 588cd0f7a6
commit d3986cc50b
4 changed files with 7 additions and 7 deletions

View File

@ -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

View File

@ -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

View File

@ -1,5 +1,5 @@
/**
* @file shell_surface.c
* @file shell.c
* @brief Wayland shell surface provider module for VLC media player
*/
/*****************************************************************************

View File

@ -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