[vlc-commits] skins: do not include vlc_vout_window.h all over
Rémi Denis-Courmont
git at videolan.org
Sat Dec 8 15:50:24 CET 2018
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Dec 8 16:37:50 2018 +0200| [498a83708a96856abe7c7a5e0f41be8d183b4e88] | committer: Rémi Denis-Courmont
skins: do not include vlc_vout_window.h all over
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=498a83708a96856abe7c7a5e0f41be8d183b4e88
---
modules/gui/skins2/commands/cmd_resize.hpp | 10 +++++-----
modules/gui/skins2/src/generic_window.hpp | 4 ++--
modules/gui/skins2/src/vout_manager.hpp | 16 ++++++++--------
modules/gui/skins2/src/vout_window.hpp | 6 +++---
modules/gui/skins2/win32/win32_window.hpp | 3 +++
modules/gui/skins2/x11/x11_window.hpp | 2 ++
6 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/modules/gui/skins2/commands/cmd_resize.hpp b/modules/gui/skins2/commands/cmd_resize.hpp
index 98c23ed32d..4e28cc95a1 100644
--- a/modules/gui/skins2/commands/cmd_resize.hpp
+++ b/modules/gui/skins2/commands/cmd_resize.hpp
@@ -26,11 +26,11 @@
#define CMD_RESIZE_HPP
#include "cmd_generic.hpp"
-#include <vlc_vout_window.h>
class WindowManager;
class GenericLayout;
class CtrlVideo;
+struct vout_window_t;
/// Command to resize a layout
@@ -56,14 +56,14 @@ class CmdResizeVout: public CmdGeneric
{
public:
/// Resize the given layout
- CmdResizeVout( intf_thread_t *pIntf, vout_window_t* pWnd,
+ CmdResizeVout( intf_thread_t *pIntf, struct vout_window_t* pWnd,
int width, int height );
virtual ~CmdResizeVout() { }
virtual void execute();
virtual std::string getType() const { return "resize vout"; }
private:
- vout_window_t* m_pWnd;
+ struct vout_window_t* m_pWnd;
int m_width, m_height;
};
@@ -73,14 +73,14 @@ class CmdSetFullscreen: public CmdGeneric
{
public:
/// Resize the given layout
- CmdSetFullscreen( intf_thread_t *pIntf, vout_window_t* pWnd,
+ CmdSetFullscreen( intf_thread_t *pIntf, struct vout_window_t* pWnd,
bool fullscreen );
virtual ~CmdSetFullscreen() { }
virtual void execute();
virtual std::string getType() const { return "toggle fullscreen"; }
private:
- vout_window_t* m_pWnd;
+ struct vout_window_t* m_pWnd;
bool m_bFullscreen;
};
#endif
diff --git a/modules/gui/skins2/src/generic_window.hpp b/modules/gui/skins2/src/generic_window.hpp
index 5753b7162b..6f37f84739 100644
--- a/modules/gui/skins2/src/generic_window.hpp
+++ b/modules/gui/skins2/src/generic_window.hpp
@@ -27,7 +27,6 @@
#include "skin_common.hpp"
#include "../utils/var_bool.hpp"
-#include "vlc_vout_window.h"
class OSWindow;
class EvtGeneric;
@@ -44,6 +43,7 @@ class EvtDragLeave;
class EvtDragOver;
class EvtDragDrop;
class WindowManager;
+struct vout_window_t;
/// Generic window class
@@ -113,7 +113,7 @@ public:
virtual std::string getType() const { return "Generic"; }
/// window handle
- void updateWindowConfiguration( vout_window_t *pWnd ) const;
+ void updateWindowConfiguration( struct vout_window_t *pWnd ) const;
/// window type
WindowType_t getType() { return m_type; }
diff --git a/modules/gui/skins2/src/vout_manager.hpp b/modules/gui/skins2/src/vout_manager.hpp
index 4cf3522b40..5cb3b389e8 100644
--- a/modules/gui/skins2/src/vout_manager.hpp
+++ b/modules/gui/skins2/src/vout_manager.hpp
@@ -27,7 +27,6 @@
#include <vector>
#include <vlc_vout.h>
-#include <vlc_vout_window.h>
#include <vlc_actions.h>
#include "../utils/position.hpp"
#include "../commands/cmd_generic.hpp"
@@ -39,19 +38,20 @@
class VarBool;
class GenericWindow;
class FscWindow;
+struct vout_window_t;
#include <stdio.h>
class SavedWnd
{
public:
- SavedWnd( vout_window_t* pWnd, VoutWindow* pVoutWindow = NULL,
+ SavedWnd( struct vout_window_t* pWnd, VoutWindow* pVoutWindow = NULL,
CtrlVideo* pCtrlVideo = NULL, int height = -1, int width = -1 )
: pWnd( pWnd ), pVoutWindow( pVoutWindow ),
pCtrlVideo( pCtrlVideo ), height( height ), width( width ) { }
~SavedWnd() { }
- vout_window_t* pWnd;
+ struct vout_window_t* pWnd;
VoutWindow *pVoutWindow;
CtrlVideo *pCtrlVideo;
int height;
@@ -107,19 +107,19 @@ public:
static void destroy( intf_thread_t *pIntf );
/// accept window request (vout window provider)
- void acceptWnd( vout_window_t *pWnd, int width, int height );
+ void acceptWnd( struct vout_window_t *pWnd, int width, int height );
// release window (vout window provider)
- void releaseWnd( vout_window_t *pWnd );
+ void releaseWnd( struct vout_window_t *pWnd );
/// set window size (vout window provider)
- void setSizeWnd( vout_window_t* pWnd, int width, int height );
+ void setSizeWnd( struct vout_window_t* pWnd, int width, int height );
/// set fullscreen mode (vout window provider)
- void setFullscreenWnd( vout_window_t* pWnd, bool b_fullscreen );
+ void setFullscreenWnd( struct vout_window_t* pWnd, bool b_fullscreen );
/// hide mouse (vout window provider)
- void hideMouseWnd( vout_window_t* pWnd, bool hide );
+ void hideMouseWnd( struct vout_window_t* pWnd, bool hide );
// Register Video Controls (when building theme)
void registerCtrlVideo( CtrlVideo* p_CtrlVideo );
diff --git a/modules/gui/skins2/src/vout_window.hpp b/modules/gui/skins2/src/vout_window.hpp
index 8303180374..307e1c3b3b 100644
--- a/modules/gui/skins2/src/vout_window.hpp
+++ b/modules/gui/skins2/src/vout_window.hpp
@@ -32,14 +32,14 @@
class OSGraphics;
class OSTimer;
class CtrlVideo;
-
+struct vout_window_t;
/// Class to handle a video output window
class VoutWindow: private GenericWindow
{
public:
- VoutWindow( intf_thread_t *pIntf, vout_window_t* pWnd,
+ VoutWindow( intf_thread_t *pIntf, struct vout_window_t* pWnd,
int width, int height, GenericWindow* pParent = NULL );
virtual ~VoutWindow();
@@ -86,7 +86,7 @@ public:
private:
/// vout thread
- vout_window_t* m_pWnd;
+ struct vout_window_t* m_pWnd;
/// original width and height
int original_width;
diff --git a/modules/gui/skins2/win32/win32_window.hpp b/modules/gui/skins2/win32/win32_window.hpp
index 47462675b7..66f2a13c00 100644
--- a/modules/gui/skins2/win32/win32_window.hpp
+++ b/modules/gui/skins2/win32/win32_window.hpp
@@ -27,6 +27,9 @@
#include "../src/generic_window.hpp"
#include "../src/os_window.hpp"
+
+#include <vlc_vout_window.h>
+
#include <windows.h>
#include <ole2.h> // LPDROPTARGET
diff --git a/modules/gui/skins2/x11/x11_window.hpp b/modules/gui/skins2/x11/x11_window.hpp
index 9ab9244125..c87ae633f0 100644
--- a/modules/gui/skins2/x11/x11_window.hpp
+++ b/modules/gui/skins2/x11/x11_window.hpp
@@ -31,6 +31,8 @@
#include "../src/generic_window.hpp"
#include "../src/os_window.hpp"
+#include <vlc_vout_window.h>
+
class X11Display;
class X11DragDrop;
More information about the vlc-commits
mailing list