Commit bf2ac249 authored by Sergey Radionov's avatar Sergey Radionov Committed by Jean-Baptiste Kempf

Win32: add vlc_player_options to VLCWindowsManager

Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent f0649525
......@@ -936,9 +936,10 @@ VLCFullScreenWnd* VLCFullScreenWnd::CreateFSWindow(VLCWindowsManager* WM)
///////////////////////
//VLCWindowsManager
///////////////////////
VLCWindowsManager::VLCWindowsManager(HMODULE hModule, const VLCViewResources& rc)
VLCWindowsManager::VLCWindowsManager(HMODULE hModule, const VLCViewResources& rc,
const vlc_player_options* po)
:_hModule(hModule), _hWindowedParentWnd(0), _p_md(0), _HolderWnd(0), _FSWnd(0),
_b_new_messages_flag(false), Last_WM_MOUSEMOVE_Pos(0), _rc(rc)
_b_new_messages_flag(false), Last_WM_MOUSEMOVE_Pos(0), _rc(rc), _po(po)
{
VLCHolderWnd::RegisterWndClassName(hModule);
VLCFullScreenWnd::RegisterWndClassName(hModule);
......
......@@ -29,6 +29,7 @@
#include <vlc/vlc.h>
#include "win32_vlcwnd.h"
#include "vlc_player_options.h"
struct VLCViewResources
{
......@@ -114,6 +115,7 @@ private:
VLCWindowsManager& WM() {return *_wm;}
inline const VLCViewResources& RC();
inline libvlc_media_player_t* MP() const;
inline const vlc_player_options* PO() const;
void CreateToolTip();
......@@ -243,7 +245,8 @@ private:
class VLCWindowsManager
{
public:
VLCWindowsManager(HMODULE hModule, const VLCViewResources& rc);
VLCWindowsManager(HMODULE hModule, const VLCViewResources& rc,
const vlc_player_options* = 0);
~VLCWindowsManager();
void CreateWindows(HWND hWindowedParentWnd);
......@@ -262,6 +265,7 @@ public:
VLCFullScreenWnd* getFullScreenWnd() const {return _FSWnd;}
libvlc_media_player_t* getMD() const {return _p_md;}
const VLCViewResources& RC() const {return _rc;}
const vlc_player_options* PO() const {return _po;}
public:
void setNewMessageFlag(bool Yes)
......@@ -280,6 +284,8 @@ private:
private:
const VLCViewResources& _rc;
HMODULE _hModule;
const vlc_player_options *const _po;
HWND _hWindowedParentWnd;
libvlc_media_player_t* _p_md;
......@@ -306,6 +312,11 @@ inline const VLCViewResources& VLCControlsWnd::RC()
return _wm->RC();
}
inline const vlc_player_options* VLCControlsWnd::PO() const
{
return _wm->PO();
}
inline libvlc_media_player_t* VLCHolderWnd::getMD() const
{
return _WindowsManager->getMD();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment