npapi-vlc | branch: master | Sergey Radionov <rsa...@gmail.com> | Tue Jan 10 11:49:47 2012 +0700| [bf2ac2490c4ce863267d366d95d5496ec13890e8] | committer: Jean-Baptiste Kempf
Win32: add vlc_player_options to VLCWindowsManager Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=bf2ac2490c4ce863267d366d95d5496ec13890e8 --- common/win32_fullscreen.cpp | 5 +++-- common/win32_fullscreen.h | 13 ++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/common/win32_fullscreen.cpp b/common/win32_fullscreen.cpp index b4a9162..75bd412 100644 --- a/common/win32_fullscreen.cpp +++ b/common/win32_fullscreen.cpp @@ -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); diff --git a/common/win32_fullscreen.h b/common/win32_fullscreen.h index 5be1f63..87789ad 100644 --- a/common/win32_fullscreen.h +++ b/common/win32_fullscreen.h @@ -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(); _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits