/*****************************************************************************
* win32_factory.cpp
*****************************************************************************
- * Copyright (C) 2003 VideoLAN
+ * Copyright (C) 2003 the VideoLAN team
* $Id$
*
* Authors: Cyril Deguet <asmax@via.ecp.fr>
WNDCLASS skinWindowClass;
skinWindowClass.style = CS_VREDRAW | CS_HREDRAW | CS_DBLCLKS;
skinWindowClass.lpfnWndProc = (WNDPROC) Win32Proc;
- skinWindowClass.lpszClassName = "SkinWindowClass";
+ skinWindowClass.lpszClassName = _T("SkinWindowClass");
skinWindowClass.lpszMenuName = NULL;
skinWindowClass.cbClsExtra = 0;
skinWindowClass.cbWndExtra = 0;
- skinWindowClass.hbrBackground = HBRUSH (COLOR_WINDOW);
+ skinWindowClass.hbrBackground = NULL;
skinWindowClass.hCursor = LoadCursor( NULL , IDC_ARROW );
- skinWindowClass.hIcon = LoadIcon( m_hInst, "VLC_ICON" );
+ skinWindowClass.hIcon = LoadIcon( m_hInst, _T("VLC_ICON") );
skinWindowClass.hInstance = m_hInst;
// Register class and check it
// Check why it failed. If it's because the class already exists
// then fine, otherwise return with an error.
- if( !GetClassInfo( m_hInst, "SkinWindowClass", &wndclass ) )
+ if( !GetClassInfo( m_hInst, _T("SkinWindowClass"), &wndclass ) )
{
msg_Err( getIntf(), "Cannot register window class" );
return false;
}
// Create Window
- m_hParentWindow = CreateWindowEx( WS_EX_APPWINDOW, "SkinWindowClass",
- "VLC media player", WS_SYSMENU|WS_POPUP, -200, -200, 0, 0, 0, 0, m_hInst, 0 );
+ m_hParentWindow = CreateWindowEx( WS_EX_APPWINDOW, _T("SkinWindowClass"),
+ _T("VLC media player"), WS_SYSMENU|WS_POPUP,
+ -200, -200, 0, 0, 0, 0, m_hInst, 0 );
if( m_hParentWindow == NULL )
{
msg_Err( getIntf(), "Cannot create parent window" );
// We do it this way otherwise CreateWindowEx will fail
// if WS_EX_LAYERED is not supported
SetWindowLongPtr( m_hParentWindow, GWL_EXSTYLE,
- GetWindowLong( m_hParentWindow, GWL_EXSTYLE )
- | WS_EX_LAYERED );
+ GetWindowLong( m_hParentWindow, GWL_EXSTYLE ) |
+ WS_EX_LAYERED );
// Store with it a pointer to the interface thread
SetWindowLongPtr( m_hParentWindow, GWLP_USERDATA, (LONG_PTR)getIntf() );
OleInitialize( NULL );
// We dynamically load msimg32.dll to get a pointer to TransparentBlt()
- m_hMsimg32 = LoadLibrary( "msimg32.dll" );
+ m_hMsimg32 = LoadLibrary( _T("msimg32.dll") );
if( !m_hMsimg32 ||
!( TransparentBlt =
(BOOL (WINAPI*)(HDC, int, int, int, int,
HDC, int, int, int, int, unsigned int))
- GetProcAddress( m_hMsimg32, "TransparentBlt" ) ) )
+ GetProcAddress( m_hMsimg32, _T("TransparentBlt") ) ) )
{
TransparentBlt = NULL;
msg_Dbg( getIntf(), "Couldn't find TransparentBlt(), "
!( AlphaBlend =
(BOOL (WINAPI*)( HDC, int, int, int, int, HDC, int, int,
int, int, BLENDFUNCTION ))
- GetProcAddress( m_hMsimg32, "AlphaBlend" ) ) )
+ GetProcAddress( m_hMsimg32, _T("AlphaBlend") ) ) )
{
AlphaBlend = NULL;
msg_Dbg( getIntf(), "Couldn't find AlphaBlend()" );
}
// Idem for user32.dll and SetLayeredWindowAttributes()
- m_hUser32 = LoadLibrary( "user32.dll" );
+ m_hUser32 = LoadLibrary( _T("user32.dll") );
if( !m_hUser32 ||
!( SetLayeredWindowAttributes =
(BOOL (WINAPI *)(HWND, COLORREF, BYTE, DWORD))
- GetProcAddress( m_hUser32, "SetLayeredWindowAttributes" ) ) )
+ GetProcAddress( m_hUser32, _T("SetLayeredWindowAttributes") ) ) )
{
SetLayeredWindowAttributes = NULL;
msg_Dbg( getIntf(), "Couldn't find SetLayeredWindowAttributes()" );
// Initialize the resource path
m_resourcePath.push_back( (string)getIntf()->p_vlc->psz_homedir +
- "\\" + CONFIG_DIR + "\\skins2" );
+ "\\" + CONFIG_DIR + "\\skins" );
+ m_resourcePath.push_back( (string)getIntf()->p_libvlc->psz_vlcpath +
+ "\\skins" );
m_resourcePath.push_back( (string)getIntf()->p_libvlc->psz_vlcpath +
"\\skins2" );
+ m_resourcePath.push_back( (string)getIntf()->p_libvlc->psz_vlcpath +
+ "\\share\\skins" );
m_resourcePath.push_back( (string)getIntf()->p_libvlc->psz_vlcpath +
"\\share\\skins2" );
ShowWindow( m_hParentWindow, SW_MINIMIZE );
}
-OSTimer *Win32Factory::createOSTimer( const Callback &rCallback )
+OSTimer *Win32Factory::createOSTimer( CmdGeneric &rCmd )
{
- return new Win32Timer( getIntf(), rCallback, m_hParentWindow );
+ return new Win32Timer( getIntf(), rCmd, m_hParentWindow );
}
RemoveDirectory( rPath.c_str() );
}
-
#endif