window: rename <vlc_vout_window.h> to <vlc_window.h>

4 years ago · 4bd922622b
56 changed files with 57 additions and 57 deletions
--- a/include/vlc_codec.h
+++ b/include/vlc_codec.h
@ -27,7 +27,7 @@

 #include <vlc_block.h>
 #include <vlc_es.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_picture.h>
 #include <vlc_subpicture.h>

--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@ -29,7 +29,7 @@
 #include <vlc_actions.h>
 #include <vlc_mouse.h>
 #include <vlc_vout.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_viewpoint.h>

 /**
--- a/include/vlc_vout_window.h
+++ b/include/vlc_vout_window.h
@ -1,5 +1,5 @@
 /*****************************************************************************
- * vlc_vout_window.h: vlc_window definitions
+ * vlc_window.h: vlc_window definitions
 *****************************************************************************
 * Copyright (C) 2008 Rémi Denis-Courmont
 * Copyright (C) 2009 Laurent Aimar
@ -737,4 +737,4 @@ static inline void vlc_window_ReportOutputDevice(vlc_window_t *window,

 /** @} */
 /** @} */
-#endif /* VLC_VOUT_WINDOW_H */
+#endif /* VLC_WINDOW_H */
--- a/modules/gui/macosx/main/macosx.m
+++ b/modules/gui/macosx/main/macosx.m
@ -33,7 +33,7 @@
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 /*****************************************************************************
 * External prototypes
--- a/modules/gui/macosx/windows/video/VLCVideoOutputProvider.h
+++ b/modules/gui/macosx/windows/video/VLCVideoOutputProvider.h
@ -23,7 +23,7 @@

 #import <Cocoa/Cocoa.h>

-#import <vlc_vout_window.h>
+#import <vlc_window.h>

@class VLCControlsBarCommon;
@class VLCVideoWindowCommon;
--- a/modules/gui/minimal_macosx/intf.m
+++ b/modules/gui/minimal_macosx/intf.m
@ -34,7 +34,7 @@

 #import <vlc_common.h>
 #import <vlc_interface.h>
-#import <vlc_vout_window.h>
+#import <vlc_window.h>

 #import "VLCMinimalVoutWindow.h"

--- a/modules/gui/minimal_macosx/macosx.c
+++ b/modules/gui/minimal_macosx/macosx.c
@ -34,7 +34,7 @@

 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 /*****************************************************************************
 * External prototypes
--- a/modules/gui/qt/maininterface/compositor.hpp
+++ b/modules/gui/qt/maininterface/compositor.hpp
@ -27,7 +27,7 @@
 #include <QObject>

 #include <vlc_common.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 #include "qt.hpp"

--- a/modules/gui/qt/maininterface/video_window_handler.cpp
+++ b/modules/gui/qt/maininterface/video_window_handler.cpp
@ -21,7 +21,7 @@
 #include <QApplication>
 #include <QScreen>

-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 VideoWindowHandler::VideoWindowHandler(qt_intf_t* intf, QObject *parent)
    : QObject(parent)
--- a/modules/gui/qt/maininterface/videosurface.hpp
+++ b/modules/gui/qt/maininterface/videosurface.hpp
@ -21,7 +21,7 @@
 #include <QtQuick/QQuickItem>
 #include <QMutex>
 #include "qt.hpp"
-#include "vlc_vout_window.h"
+#include "vlc_window.h"

 class MainCtx;
 class VideoSurfaceProvider : public QObject
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@ -65,7 +65,7 @@ extern "C" char **environ;
 #include "playlist/playlist_item.hpp"

 #include <vlc_plugin.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_cxx_helpers.hpp>

 #ifdef QT_STATIC /* For static builds */
--- a/modules/gui/skins2/os2/os2_window.hpp
+++ b/modules/gui/skins2/os2/os2_window.hpp
@ -28,7 +28,7 @@
 #include "../src/generic_window.hpp"
 #include "../src/os_window.hpp"

-#include <vlc_vout_window.h>
+#include <vlc_window.h>


 /// OS2 implementation of OSWindow
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/modules/gui/skins2/src/skin_main.cpp
@ -32,7 +32,7 @@
 #include <vlc_plugin.h>
 #include <vlc_playlist.h>
 #include <vlc_threads.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 #include "dialogs.hpp"
 #include "os_factory.hpp"
--- a/modules/gui/skins2/src/vout_window.hpp
+++ b/modules/gui/skins2/src/vout_window.hpp
@ -26,7 +26,7 @@
 #include "generic_window.hpp"
 #include "dialogs.hpp"
 #include "../commands/cmd_generic.hpp"
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <memory>

 class OSGraphics;
--- a/modules/gui/skins2/win32/win32_window.hpp
+++ b/modules/gui/skins2/win32/win32_window.hpp
@ -27,7 +27,7 @@
 #include "../src/generic_window.hpp"
 #include "../src/os_window.hpp"

-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 #include <windows.h>
 #include <ole2.h>   // LPDROPTARGET
--- a/modules/gui/skins2/x11/x11_window.hpp
+++ b/modules/gui/skins2/x11/x11_window.hpp
@ -30,7 +30,7 @@
 #include "../src/generic_window.hpp"
 #include "../src/os_window.hpp"

-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 class X11Display;
 class X11DragDrop;
--- a/modules/hw/mmal/decoder_device.c
+++ b/modules/hw/mmal/decoder_device.c
@ -26,7 +26,7 @@

 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_codec.h>

 #include <bcm_host.h>
--- a/modules/hw/nvdec/nvdec_gl.c
+++ b/modules/hw/nvdec/nvdec_gl.c
@ -27,7 +27,7 @@
 #include <assert.h>

 #include <vlc_common.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_codec.h>
 #include <vlc_plugin.h>

--- a/modules/hw/vaapi/decoder_device.c
+++ b/modules/hw/vaapi/decoder_device.c
@ -24,7 +24,7 @@

 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_codec.h>
 #include <vlc_fs.h>

--- a/modules/hw/vdpau/device.c
+++ b/modules/hw/vdpau/device.c
@ -28,7 +28,7 @@
 #include <vlc_common.h>
 #include <vlc_codec.h>
 #include <vlc_plugin.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_xlib.h>
 #include "vlc_vdpau.h"

--- a/modules/misc/inhibit/uikit-inhibit.m
+++ b/modules/misc/inhibit/uikit-inhibit.m
@ -28,7 +28,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_inhibit.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 #include <UIKit/UIKit.h>

--- a/modules/misc/inhibit/wl-idle-inhibit.c
+++ b/modules/misc/inhibit/wl-idle-inhibit.c
@ -34,7 +34,7 @@

 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_inhibit.h>

 struct vlc_inhibit_sys
--- a/modules/video_filter/opengl.c
+++ b/modules/video_filter/opengl.c
@ -27,7 +27,7 @@
 #include <vlc_picture.h>
 #include <vlc_filter.h>
 #include <vlc_opengl.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_vout_display.h>
 #include <vlc_atomic.h>
 #include "../video_output/opengl/vout_helper.h"
--- a/modules/video_output/android/window.c
+++ b/modules/video_output/android/window.c
@ -30,7 +30,7 @@

 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_codec.h>

 #include <dlfcn.h>
--- a/modules/video_output/apple/VLCVideoUIView.m
+++ b/modules/video_output/apple/VLCVideoUIView.m
@ -66,7 +66,7 @@
 #import <vlc_plugin.h>
 #import <vlc_dialog.h>
 #import <vlc_mouse.h>
-#import <vlc_vout_window.h>
+#import <vlc_window.h>

@interface VLCVideoUIView : UIView {
    /* VLC window object, set to NULL under _mutex lock when closing. */
--- a/modules/video_output/drawable_os2.c
+++ b/modules/video_output/drawable_os2.c
@ -29,7 +29,7 @@

 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 #define HWND_TEXT N_("Window handle (HWND)")
 #define HWND_LONGTEXT N_( \
--- a/modules/video_output/drm/display.c
+++ b/modules/video_output/drm/display.c
@ -39,7 +39,7 @@
 #include <vlc_plugin.h>
 #include <vlc_vout_display.h>
 #include <vlc_picture.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include "vlc_drm.h"

 #include <assert.h>
--- a/modules/video_output/glx.c
+++ b/modules/video_output/glx.c
@ -32,7 +32,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_opengl.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_xlib.h>

 #ifndef GLX_ARB_get_proc_address
--- a/modules/video_output/kms.c
+++ b/modules/video_output/kms.c
@ -42,7 +42,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_fs.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 #include <assert.h>

--- a/modules/video_output/opengl/egl.c
+++ b/modules/video_output/opengl/egl.c
@ -32,7 +32,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_opengl.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #ifdef USE_PLATFORM_X11
 # include <vlc_xlib.h>
 #endif
--- a/modules/video_output/opengl/interop_vaapi.c
+++ b/modules/video_output/opengl/interop_vaapi.c
@ -29,7 +29,7 @@
 #include <va/va_drmcommon.h>

 #include <vlc_common.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_codec.h>
 #include <vlc_plugin.h>

--- a/modules/video_output/opengl/interop_vdpau.c
+++ b/modules/video_output/opengl/interop_vdpau.c
@ -30,7 +30,7 @@
 #include <GL/glext.h>

 #include <vlc_common.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_xlib.h>
 #include <vlc_codec.h>
 #include <vlc_plugin.h>
--- a/modules/video_output/vulkan/platform.h
+++ b/modules/video_output/vulkan/platform.h
@ -22,7 +22,7 @@
 #define VLC_VULKAN_PLATFORM_H

 #include <vlc_common.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 #include <vulkan/vulkan.h>

--- a/modules/video_output/wayland/input.c
+++ b/modules/video_output/wayland/input.c
@ -35,7 +35,7 @@
 # include "../xcb/vlc_xkb.h"
 #endif
 #include <vlc_common.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_mouse.h>
 #include <vlc_fs.h>

--- a/modules/video_output/wayland/output.c
+++ b/modules/video_output/wayland/output.c
@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <wayland-client.h>
 #include <vlc_common.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 #include "output.h"

--- a/modules/video_output/wayland/xdg-shell.c
+++ b/modules/video_output/wayland/xdg-shell.c
@ -61,7 +61,7 @@

 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 #include "input.h"
 #include "output.h"
--- a/modules/video_output/wdummy.c
+++ b/modules/video_output/wdummy.c
@ -28,7 +28,7 @@

 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 static int Enable(vlc_window_t *wnd, const vlc_window_cfg_t *cfg)
 {
--- a/modules/video_output/wextern.c
+++ b/modules/video_output/wextern.c
@ -28,7 +28,7 @@

 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 #include <vlc/libvlc.h>
 #include <vlc/libvlc_picture.h>
--- a/modules/video_output/win32/drawable.c
+++ b/modules/video_output/win32/drawable.c
@ -29,7 +29,7 @@

 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 #define HWND_TEXT N_("Window handle (HWND)")
 #define HWND_LONGTEXT N_( \
--- a/modules/video_output/win32/events.h
+++ b/modules/video_output/win32/events.h
@ -21,7 +21,7 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
 *****************************************************************************/

-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_vout_display.h>

 /**
--- a/modules/video_output/win32/window.c
+++ b/modules/video_output/win32/window.c
@ -34,7 +34,7 @@
 #include <vlc_common.h>
 #include <vlc_charset.h>
 #include <vlc_plugin.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_mouse.h>
 #include <vlc_actions.h>

--- a/modules/video_output/window_macosx.m
+++ b/modules/video_output/window_macosx.m
@ -30,7 +30,7 @@

 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 #define VLC_ASSERT_MAINTHREAD NSAssert([[NSThread currentThread] isMainThread], \
    @"Must be called from the main thread!")
--- a/modules/video_output/window_os2.c
+++ b/modules/video_output/window_os2.c
@ -30,7 +30,7 @@
 #include <vlc_common.h>
 #include <vlc_charset.h>
 #include <vlc_plugin.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_mouse.h>
 #include <vlc_actions.h>

--- a/modules/video_output/xcb/window.c
+++ b/modules/video_output/xcb/window.c
@ -47,7 +47,7 @@ typedef xcb_atom_t Atom;
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_actions.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 typedef struct
 {
--- a/modules/video_splitter/panoramix.c
+++ b/modules/video_splitter/panoramix.c
@ -34,7 +34,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_video_splitter.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 #define OVERLAP

--- a/modules/video_splitter/wall.c
+++ b/modules/video_splitter/wall.c
@ -32,7 +32,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_video_splitter.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 #define ROW_MAX (15)
 #define COL_MAX (15)
--- a/modules/visualization/glspectrum.c
+++ b/modules/visualization/glspectrum.c
@ -29,7 +29,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_opengl.h>
 #include <vlc_filter.h>
 #include <vlc_queue.h>
--- a/modules/visualization/projectm.cpp
+++ b/modules/visualization/projectm.cpp
@ -28,7 +28,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_opengl.h>
 #include <vlc_filter.h>
 #include <vlc_rand.h>
--- a/modules/visualization/vsxu.cpp
+++ b/modules/visualization/vsxu.cpp
@ -31,7 +31,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_opengl.h>
 #include <vlc_filter.h>

--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -118,7 +118,7 @@ pluginsinclude_HEADERS = \
 	../include/vlc_vout.h \
 	../include/vlc_vout_display.h \
 	../include/vlc_vout_osd.h \
-	../include/vlc_vout_window.h \
+	../include/vlc_window.h \
 	../include/vlc_xlib.h \
 	../include/vlc_xml.h \
 	$(NULL)
--- a/src/video_output/opengl.c
+++ b/src/video_output/opengl.c
@ -171,7 +171,7 @@ void vlc_gl_Delete(vlc_gl_t *gl)
    vlc_object_delete(gl);
 }

-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 typedef struct vlc_gl_surface
 {
--- a/src/video_output/video_window.c
+++ b/src/video_output/video_window.c
@ -25,7 +25,7 @@
 #include <stdlib.h>

 #include <vlc_common.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_vout.h>
 #include <vlc_vout_display.h>
 #include "video_window.h"
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@ -32,7 +32,7 @@
 #include <stdlib.h>

 #include <vlc_common.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_modules.h>
 #include "inhibit.h"
 #include <libvlc.h>
--- a/test/modules/stream_out/transcode.c
+++ b/test/modules/stream_out/transcode.c
@ -37,7 +37,7 @@ const char vlc_module_name[] = MODULE_STRING;
 #include <vlc_access.h>
 #include <vlc_demux.h>
 #include <vlc_codec.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_interface.h>
 #include <vlc_player.h>
 #include <vlc_filter.h>
--- a/test/src/video_output/video_output.c
+++ b/test/src/video_output/video_output.c
@ -37,7 +37,7 @@ const char vlc_module_name[] = MODULE_STRING;
 #include <vlc_access.h>
 #include <vlc_demux.h>
 #include <vlc_codec.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>
 #include <vlc_interface.h>
 #include <vlc_player.h>
 #include <vlc_filter.h>
--- a/test/vlc-window.c
+++ b/test/vlc-window.c
@ -17,7 +17,7 @@
 #endif

 #include <vlc_common.h>
-#include <vlc_vout_window.h>
+#include <vlc_window.h>

 #include "../lib/libvlc_internal.h"