[vlc-devel] [PATCH 06/13] common/win32_fullscreen: resources have moved to VLCViewResources
Sergey Radionov
rsatom at gmail.com
Fri Jan 13 04:54:30 CET 2012
---
activex/plugin.cpp | 30 +++++++++++++-
activex/plugin.h | 1 +
common/win32_fullscreen.cpp | 93 ++++++++++++------------------------------
common/win32_fullscreen.h | 74 +++++++++++++++++++++++++++-------
npapi/vlcplugin_win.cpp | 29 +++++++++++++-
npapi/vlcplugin_win.h | 1 +
6 files changed, 144 insertions(+), 84 deletions(-)
diff --git a/activex/plugin.cpp b/activex/plugin.cpp
index 9c70ba2..6bd3462 100644
--- a/activex/plugin.cpp
+++ b/activex/plugin.cpp
@@ -217,7 +217,7 @@ extern HMODULE DllGetModule();
VLCPlugin::VLCPlugin(VLCPluginClass *p_class, LPUNKNOWN pUnkOuter) :
_inplacewnd(NULL),
- _WindowsManager(DllGetModule()),
+ _WindowsManager(DllGetModule(), _ViewRC),
_p_class(p_class),
_i_ref(1UL),
_p_libvlc(NULL),
@@ -227,6 +227,34 @@ VLCPlugin::VLCPlugin(VLCPluginClass *p_class, LPUNKNOWN pUnkOuter) :
_i_codepage(CP_ACP),
_b_usermode(TRUE)
{
+ _ViewRC.hDeFullscreenBitmap =
+ LoadImage(DllGetModule(), MAKEINTRESOURCE(3),
+ IMAGE_BITMAP, 0, 0, LR_LOADMAP3DCOLORS);
+
+ _ViewRC.hPlayBitmap =
+ LoadImage(DllGetModule(), MAKEINTRESOURCE(4),
+ IMAGE_BITMAP, 0, 0, LR_LOADMAP3DCOLORS);
+
+ _ViewRC.hPauseBitmap =
+ LoadImage(DllGetModule(), MAKEINTRESOURCE(5),
+ IMAGE_BITMAP, 0, 0, LR_LOADMAP3DCOLORS);
+
+ _ViewRC.hVolumeBitmap =
+ LoadImage(DllGetModule(), MAKEINTRESOURCE(6),
+ IMAGE_BITMAP, 0, 0, LR_LOADMAP3DCOLORS);
+
+ _ViewRC.hVolumeMutedBitmap =
+ LoadImage(DllGetModule(), MAKEINTRESOURCE(7),
+ IMAGE_BITMAP, 0, 0, LR_LOADMAP3DCOLORS);
+
+ _ViewRC.hBackgroundIcon =
+ (HICON) LoadImage(DllGetModule(), MAKEINTRESOURCE(8),
+ IMAGE_ICON, 0, 0, LR_DEFAULTSIZE);
+
+ _ViewRC.hFullscreenBitmap =
+ LoadImage(DllGetModule(), MAKEINTRESOURCE(9),
+ IMAGE_BITMAP, 0, 0, LR_LOADMAP3DCOLORS);
+
p_class->AddRef();
vlcOleControl = new VLCOleControl(this);
diff --git a/activex/plugin.h b/activex/plugin.h
index 5bd1ef4..e64a18e 100644
--- a/activex/plugin.h
+++ b/activex/plugin.h
@@ -361,6 +361,7 @@ private:
// in place activated window (Plugin window)
HWND _inplacewnd;
+ VLCViewResources _ViewRC;
VLCWindowsManager _WindowsManager;
VLCPluginClass* _p_class;
diff --git a/common/win32_fullscreen.cpp b/common/win32_fullscreen.cpp
index 3f4d06c..37ee793 100644
--- a/common/win32_fullscreen.cpp
+++ b/common/win32_fullscreen.cpp
@@ -28,8 +28,6 @@
#include <commctrl.h>
#include <uxtheme.h>
-#include <vlc/vlc.h>
-
#include "win32_fullscreen.h"
/////////////////////////////////
@@ -97,11 +95,6 @@ VLCHolderWnd* VLCHolderWnd::CreateHolderWindow(HWND hParentWnd, VLCWindowsManage
return 0;
}
-libvlc_media_player_t* VLCHolderWnd::getMD() const
-{
- return _WindowsManager->getMD();
-}
-
LRESULT CALLBACK VLCHolderWnd::VLCHolderClassWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
VLCHolderWnd* h_data = reinterpret_cast<VLCHolderWnd*>(GetWindowLongPtr(hWnd, GWLP_USERDATA));
@@ -120,8 +113,6 @@ LRESULT CALLBACK VLCHolderWnd::VLCHolderClassWndProc(HWND hWnd, UINT uMsg, WPARA
MoveWindow(hWnd, 0, 0,
(ParentClientRect.right-ParentClientRect.left),
(ParentClientRect.bottom-ParentClientRect.top), FALSE);
-
- h_data->_hConeIcon = LoadIcon( h_data->_WindowsManager->getHModule(), MAKEINTRESOURCE(8) );
break;
}
case WM_PAINT:{
@@ -131,7 +122,7 @@ LRESULT CALLBACK VLCHolderWnd::VLCHolderClassWndProc(HWND hWnd, UINT uMsg, WPARA
GetClientRect(hWnd, &rect);
int IconX = ((rect.right - rect.left) - GetSystemMetrics(SM_CXICON))/2;
int IconY = ((rect.bottom - rect.top) - GetSystemMetrics(SM_CYICON))/2;
- DrawIcon(hDC, IconX, IconY, h_data->_hConeIcon);
+ DrawIcon(hDC, IconX, IconY, h_data->RC().hBackgroundIcon);
EndPaint(hWnd, &PaintStruct);
break;
}
@@ -384,7 +375,6 @@ LRESULT CALLBACK VLCFullScreenWnd::FSWndWindowProc(HWND hWnd, UINT uMsg, WPARAM
#define ID_FS_VIDEO_POS_SCROLL 3
#define ID_FS_MUTE 4
#define ID_FS_VOLUME 5
-#define ID_FS_LABEL 5
LRESULT CALLBACK VLCFullScreenWnd::FSControlsWndWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
@@ -395,14 +385,10 @@ LRESULT CALLBACK VLCFullScreenWnd::FSControlsWndWindowProc(HWND hWnd, UINT uMsg,
case WM_CREATE:{
CREATESTRUCT* CreateStruct = (CREATESTRUCT*)(lParam);
fs_data = (VLCFullScreenWnd*)CreateStruct->lpCreateParams;
- HMODULE hDllModule = fs_data->_WindowsManager->getHModule();
+ const VLCViewResources& rc = fs_data->RC();
SetWindowLongPtr(hWnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(fs_data));
- fs_data->hNewMessageBitmap = (HICON)
- LoadImage(hDllModule, MAKEINTRESOURCE(8),
- IMAGE_BITMAP, 0, 0, LR_LOADMAP3DCOLORS);
-
const int ControlsHeight = 21+2;
const int ButtonsWidth = ControlsHeight;
const int ControlsSpace = 5;
@@ -413,24 +399,14 @@ LRESULT CALLBACK VLCFullScreenWnd::FSControlsWndWindowProc(HWND hWnd, UINT uMsg,
fs_data->hFSButton =
CreateWindow(TEXT("BUTTON"), TEXT("End Full Screen"), WS_CHILD|WS_VISIBLE|BS_BITMAP|BS_FLAT,
HorizontalOffset, ControlsSpace, ControlWidth, ControlsHeight, hWnd, (HMENU)ID_FS_SWITCH_FS, 0, 0);
- fs_data->hFSButtonBitmap =
- LoadImage(hDllModule, MAKEINTRESOURCE(3),
- IMAGE_BITMAP, 0, 0, LR_LOADMAP3DCOLORS);
- SendMessage(fs_data->hFSButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)fs_data->hFSButtonBitmap);
- //SendMessage(fs_data->hFSButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)fs_data->hNewMessageBitmap);
+ SendMessage(fs_data->hFSButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)rc.hDeFullscreenBitmap);
HorizontalOffset+=ControlWidth+ControlsSpace;
ControlWidth = ButtonsWidth;
fs_data->hPlayPauseButton =
CreateWindow(TEXT("BUTTON"), TEXT("Play/Pause"), WS_CHILD|WS_VISIBLE|BS_BITMAP|BS_FLAT,
HorizontalOffset, ControlsSpace, ControlWidth, ControlsHeight, hWnd, (HMENU)ID_FS_PLAY_PAUSE, 0, 0);
- fs_data->hPlayBitmap =
- LoadImage(hDllModule, MAKEINTRESOURCE(4),
- IMAGE_BITMAP, 0, 0, LR_LOADMAP3DCOLORS);
- fs_data->hPauseBitmap =
- LoadImage(hDllModule, MAKEINTRESOURCE(5),
- IMAGE_BITMAP, 0, 0, LR_LOADMAP3DCOLORS);
- SendMessage(fs_data->hPlayPauseButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)fs_data->hPauseBitmap);
+ SendMessage(fs_data->hPlayPauseButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)rc.hPauseBitmap);
HorizontalOffset+=ControlWidth+ControlsSpace;
ControlWidth = 200;
@@ -454,13 +430,7 @@ LRESULT CALLBACK VLCFullScreenWnd::FSControlsWndWindowProc(HWND hWnd, UINT uMsg,
fs_data->hMuteButton =
CreateWindow(TEXT("BUTTON"), TEXT("Mute"), WS_CHILD|WS_VISIBLE|BS_AUTOCHECKBOX|BS_PUSHLIKE|BS_BITMAP, //BS_FLAT
HorizontalOffset, ControlsSpace, ControlWidth, ControlsHeight, hWnd, (HMENU)ID_FS_MUTE, 0, 0);
- fs_data->hVolumeBitmap =
- LoadImage(hDllModule, MAKEINTRESOURCE(6),
- IMAGE_BITMAP, 0, 0, LR_LOADMAP3DCOLORS|LR_SHARED);
- fs_data->hVolumeMutedBitmap =
- LoadImage(hDllModule, MAKEINTRESOURCE(7),
- IMAGE_BITMAP, 0, 0, LR_LOADMAP3DCOLORS|LR_SHARED);
- SendMessage(fs_data->hMuteButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)fs_data->hVolumeBitmap);
+ SendMessage(fs_data->hMuteButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)rc.hVolumeBitmap);
HorizontalOffset+=ControlWidth+ControlsSpace;
ControlWidth = 100;
@@ -511,16 +481,17 @@ LRESULT CALLBACK VLCFullScreenWnd::FSControlsWndWindowProc(HWND hWnd, UINT uMsg,
break;
}
case 2:{
+ const VLCViewResources& rc = fs_data->RC();
LRESULT lResult = SendMessage(fs_data->hFSButton, BM_GETIMAGE, (WPARAM)IMAGE_BITMAP, 0);
- if((HANDLE)lResult == fs_data->hFSButtonBitmap){
+ if((HANDLE)lResult == rc.hDeFullscreenBitmap){
if(fs_data->_WindowsManager->getNewMessageFlag()){
- SendMessage(fs_data->hFSButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)fs_data->hNewMessageBitmap);
+ SendMessage(fs_data->hFSButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)rc.hNewMessageBitmap);
//do not allow control window to close while there are new messages
fs_data->NeedShowControls();
}
}
else{
- SendMessage(fs_data->hFSButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)fs_data->hFSButtonBitmap);
+ SendMessage(fs_data->hFSButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)rc.hDeFullscreenBitmap);
}
break;
@@ -617,26 +588,6 @@ VLCFullScreenWnd::~VLCFullScreenWnd()
::DestroyWindow(hToolTipWnd);
hToolTipWnd = 0;
}
-
- DestroyIcon(hNewMessageBitmap);
- hNewMessageBitmap = 0;
- DeleteObject(hFSButtonBitmap);
- hFSButtonBitmap = 0;
-
- DeleteObject(hPauseBitmap);
- hPauseBitmap = 0;
- DeleteObject(hPlayBitmap);
- hPlayBitmap = 0;
-
- DeleteObject(hVolumeBitmap);
- hVolumeBitmap = 0;
- DeleteObject(hVolumeMutedBitmap);
- hVolumeMutedBitmap = 0;
-}
-
-libvlc_media_player_t* VLCFullScreenWnd::getMD() const
-{
- return _WindowsManager->getMD();
}
void VLCFullScreenWnd::NeedShowControls()
@@ -652,7 +603,9 @@ void VLCFullScreenWnd::NeedShowControls()
SyncVolumeSliderWithVLCVolume();
}
if(hPlayPauseButton){
- SendMessage(hPlayPauseButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)(IsPlaying()?hPauseBitmap:hPlayBitmap));
+ HANDLE hBmp = IsPlaying() ? RC().hPauseBitmap : RC().hPlayBitmap;
+ SendMessage(hPlayPauseButton, BM_SETIMAGE,
+ (WPARAM)IMAGE_BITMAP, (LPARAM)hBmp);
}
}
ShowWindow(hControlsWnd, SW_SHOW);
@@ -719,8 +672,12 @@ void VLCFullScreenWnd::SyncVolumeSliderWithVLCVolume()
SendMessage(hMuteButton, BM_SETCHECK, (WPARAM)(muted?BST_CHECKED:BST_UNCHECKED), 0);
}
LRESULT lResult = SendMessage(hMuteButton, BM_GETIMAGE, (WPARAM)IMAGE_BITMAP, 0);
- if( (muted && ((HANDLE)lResult == hVolumeBitmap)) || (!muted&&((HANDLE)lResult == hVolumeMutedBitmap)) ){
- SendMessage(hMuteButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)(muted?hVolumeMutedBitmap:hVolumeBitmap));
+ if( (muted && ((HANDLE)lResult == RC().hVolumeBitmap)) ||
+ (!muted&&((HANDLE)lResult == RC().hVolumeMutedBitmap)) )
+ {
+ HANDLE hBmp = muted ? RC().hVolumeMutedBitmap : RC().hVolumeBitmap ;
+ SendMessage(hMuteButton, BM_SETIMAGE,
+ (WPARAM)IMAGE_BITMAP, (LPARAM)hBmp);
}
}
}
@@ -801,16 +758,20 @@ void VLCFullScreenWnd::handle_position_changed_event(const libvlc_event_t* event
void VLCFullScreenWnd::handle_input_state_event(const libvlc_event_t* event)
{
+ const VLCViewResources& rc = RC();
switch( event->type )
{
case libvlc_MediaPlayerPlaying:
- SendMessage(hPlayPauseButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hPauseBitmap);
+ SendMessage(hPlayPauseButton, BM_SETIMAGE,
+ (WPARAM)IMAGE_BITMAP, (LPARAM)rc.hPauseBitmap);
break;
case libvlc_MediaPlayerPaused:
- SendMessage(hPlayPauseButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hPlayBitmap);
+ SendMessage(hPlayPauseButton, BM_SETIMAGE,
+ (WPARAM)IMAGE_BITMAP, (LPARAM)rc.hPlayBitmap);
break;
case libvlc_MediaPlayerStopped:
- SendMessage(hPlayPauseButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hPlayBitmap);
+ SendMessage(hPlayPauseButton, BM_SETIMAGE,
+ (WPARAM)IMAGE_BITMAP, (LPARAM)rc.hPlayBitmap);
break;
}
}
@@ -836,9 +797,9 @@ void VLCFullScreenWnd::OnLibVlcEvent(const libvlc_event_t* event)
///////////////////////
//VLCWindowsManager
///////////////////////
-VLCWindowsManager::VLCWindowsManager(HMODULE hModule)
+VLCWindowsManager::VLCWindowsManager(HMODULE hModule, const VLCViewResources& rc)
:_hModule(hModule), _hWindowedParentWnd(0), _p_md(0), _HolderWnd(0), _FSWnd(0),
- _b_new_messages_flag(false), Last_WM_MOUSEMOVE_Pos(0)
+ _b_new_messages_flag(false), Last_WM_MOUSEMOVE_Pos(0), _rc(rc)
{
VLCHolderWnd::RegisterWndClassName(hModule);
VLCFullScreenWnd::RegisterWndClassName(hModule);
diff --git a/common/win32_fullscreen.h b/common/win32_fullscreen.h
index dd07ae1..2a37a76 100644
--- a/common/win32_fullscreen.h
+++ b/common/win32_fullscreen.h
@@ -26,6 +26,26 @@
#ifdef _WIN32
+#include <vlc/vlc.h>
+
+struct VLCViewResources
+{
+ VLCViewResources()
+ :hNewMessageBitmap(0), hDeFullscreenBitmap(0), hPauseBitmap(0),
+ hPlayBitmap(0), hVolumeBitmap(0), hVolumeMutedBitmap(0),
+ hBackgroundIcon(0)
+ {};
+
+ HANDLE hNewMessageBitmap;
+ HANDLE hFullscreenBitmap;
+ HANDLE hDeFullscreenBitmap;
+ HANDLE hPauseBitmap;
+ HANDLE hPlayBitmap;
+ HANDLE hVolumeBitmap;
+ HANDLE hVolumeMutedBitmap;
+ HICON hBackgroundIcon;
+};
+
class VLCWindowsManager;
///////////////////////
//VLCHolderWnd
@@ -53,7 +73,10 @@ private:
DWORD _MouseHookThreadId;
void MouseHook(bool SetHook);
- libvlc_media_player_t* getMD() const;
+ VLCWindowsManager& WM()
+ {return *_WindowsManager;}
+ inline libvlc_media_player_t* getMD() const;
+ inline const VLCViewResources& RC() const;
private:
static HINSTANCE _hinstance;
@@ -62,14 +85,13 @@ private:
private:
VLCHolderWnd(HWND hWnd, VLCWindowsManager* WM)
: _hMouseHook(NULL), _MouseHookThreadId(0), _hWnd(hWnd),
- _WindowsManager(WM), _hConeIcon(0){};
+ _WindowsManager(WM){};
public:
HWND getHWND() const {return _hWnd;}
private:
HWND _hWnd;
- HICON _hConeIcon;
VLCWindowsManager* _WindowsManager;
};
@@ -99,16 +121,17 @@ private:
private:
VLCFullScreenWnd(HWND hWnd, VLCWindowsManager* WM)
- : _WindowsManager(WM), hControlsWnd(0), hToolTipWnd(0),
- hNewMessageBitmap(0), hFSButtonBitmap(0), hFSButton(0),
- hPauseBitmap(0), hPlayBitmap(0), hPlayPauseButton(0), hVideoPosScroll(0),
- hVolumeBitmap(0), hVolumeMutedBitmap(0),hMuteButton(0),
- hVolumeSlider(0), _hWnd(hWnd) {};
+ :_WindowsManager(WM), hControlsWnd(0), hToolTipWnd(0),
+ hFSButton(0), hPlayPauseButton(0), hVideoPosScroll(0),
+ hMuteButton(0), hVolumeSlider(0), _hWnd(hWnd) {};
~VLCFullScreenWnd();
private:
- libvlc_media_player_t* getMD() const;
+ VLCWindowsManager& WM()
+ {return *_WindowsManager;}
+ inline libvlc_media_player_t* getMD() const;
+ inline const VLCViewResources& RC() const;
bool IsPlaying()
{
@@ -146,18 +169,12 @@ private:
HWND hControlsWnd;
HWND hToolTipWnd;
- HICON hNewMessageBitmap;
- HANDLE hFSButtonBitmap;
HWND hFSButton;
- HANDLE hPauseBitmap;
- HANDLE hPlayBitmap;
HWND hPlayPauseButton;
HWND hVideoPosScroll;
- HANDLE hVolumeBitmap;
- HANDLE hVolumeMutedBitmap;
HWND hMuteButton;
HWND hVolumeSlider;
@@ -181,7 +198,7 @@ private:
class VLCWindowsManager
{
public:
- VLCWindowsManager(HMODULE hModule);
+ VLCWindowsManager(HMODULE hModule, const VLCViewResources& rc);
~VLCWindowsManager();
void CreateWindows(HWND hWindowedParentWnd);
@@ -199,6 +216,7 @@ public:
VLCHolderWnd* getHolderWnd() const {return _HolderWnd;}
VLCFullScreenWnd* getFullScreenWnd() const {return _FSWnd;}
libvlc_media_player_t* getMD() const {return _p_md;}
+ const VLCViewResources& RC() const {return _rc;}
public:
void setNewMessageFlag(bool Yes)
@@ -215,6 +233,7 @@ private:
void OnLibVlcEvent(const libvlc_event_t* event);
private:
+ const VLCViewResources& _rc;
HMODULE _hModule;
HWND _hWindowedParentWnd;
@@ -229,6 +248,29 @@ private:
DWORD Last_WM_MOUSEMOVE_Pos;
};
+////////////////////////////
+//inlines
+////////////////////////////
+inline libvlc_media_player_t* VLCHolderWnd::getMD() const
+{
+ return _WindowsManager->getMD();
+}
+
+inline const VLCViewResources& VLCHolderWnd::RC() const
+{
+ return _WindowsManager->RC();
+}
+
+inline libvlc_media_player_t* VLCFullScreenWnd::getMD() const
+{
+ return _WindowsManager->getMD();
+}
+
+inline const VLCViewResources& VLCFullScreenWnd::RC() const
+{
+ return _WindowsManager->RC();
+}
+
#endif //_WIN32
#endif //VLC_FULLSCREEN_H
diff --git a/npapi/vlcplugin_win.cpp b/npapi/vlcplugin_win.cpp
index 726e87a..a0ae09d 100644
--- a/npapi/vlcplugin_win.cpp
+++ b/npapi/vlcplugin_win.cpp
@@ -87,8 +87,35 @@ LRESULT CALLBACK VlcPluginWin::NPWndProcR(HWND hWnd, UINT uMsg, WPARAM wParam, L
VlcPluginWin::VlcPluginWin(NPP instance, NPuint16_t mode) :
VlcPluginBase(instance, mode), _NPWndProc(0),
- _WindowsManager(DllGetModule())
+ _WindowsManager(DllGetModule(), _ViewRC)
{
+ _ViewRC.hDeFullscreenBitmap =
+ LoadImage(DllGetModule(), MAKEINTRESOURCE(3),
+ IMAGE_BITMAP, 0, 0, LR_LOADMAP3DCOLORS);
+
+ _ViewRC.hPlayBitmap =
+ LoadImage(DllGetModule(), MAKEINTRESOURCE(4),
+ IMAGE_BITMAP, 0, 0, LR_LOADMAP3DCOLORS);
+
+ _ViewRC.hPauseBitmap =
+ LoadImage(DllGetModule(), MAKEINTRESOURCE(5),
+ IMAGE_BITMAP, 0, 0, LR_LOADMAP3DCOLORS);
+
+ _ViewRC.hVolumeBitmap =
+ LoadImage(DllGetModule(), MAKEINTRESOURCE(6),
+ IMAGE_BITMAP, 0, 0, LR_LOADMAP3DCOLORS);
+
+ _ViewRC.hVolumeMutedBitmap =
+ LoadImage(DllGetModule(), MAKEINTRESOURCE(7),
+ IMAGE_BITMAP, 0, 0, LR_LOADMAP3DCOLORS);
+
+ _ViewRC.hBackgroundIcon =
+ (HICON) LoadImage(DllGetModule(), MAKEINTRESOURCE(8),
+ IMAGE_ICON, 0, 0, LR_DEFAULTSIZE);
+
+ _ViewRC.hFullscreenBitmap =
+ LoadImage(DllGetModule(), MAKEINTRESOURCE(9),
+ IMAGE_BITMAP, 0, 0, LR_LOADMAP3DCOLORS);
}
VlcPluginWin::~VlcPluginWin()
diff --git a/npapi/vlcplugin_win.h b/npapi/vlcplugin_win.h
index 6c998ad..a77a91e 100644
--- a/npapi/vlcplugin_win.h
+++ b/npapi/vlcplugin_win.h
@@ -67,6 +67,7 @@ private:
void set_player_window(){};
WNDPROC _NPWndProc;
+ VLCViewResources _ViewRC;
VLCWindowsManager _WindowsManager;
};
--
1.7.7.1.msysgit.0
More information about the vlc-devel
mailing list