#include "input_manager.hpp"
#include "actions_manager.hpp"
-#ifdef WIN32
- #include <QBitmap>
- #include <vlc_windows_interfaces.h>
+#include <QBitmap>
+#include <vlc_windows_interfaces.h>
#define WM_APPCOMMAND 0x0319
{
p_taskbl->vt->HrInit(p_taskbl);
- if(himl = ImageList_Create( 20, //cx
+ if( (himl = ImageList_Create( 20, //cx
20, //cy
ILC_COLOR32,//flags
4,//initial nb of images
0//nb of images that can be added
- ))
+ ) ) != NULL )
{
QPixmap img = QPixmap(":/win7/prev");
QPixmap img2 = QPixmap(":/win7/pause");
HRESULT hr = p_taskbl->vt->ThumbBarSetImageList(p_taskbl, winId(), himl );
if(S_OK != hr)
- msg_Err( p_intf, "ThumbBarSetImageList failed with error %08x", hr );
+ msg_Err( p_intf, "ThumbBarSetImageList failed with error %08lx", hr );
else
{
hr = p_taskbl->vt->ThumbBarAddButtons(p_taskbl, winId(), 3, thbButtons);
if(S_OK != hr)
- msg_Err( p_intf, "ThumbBarAddButtons failed with error %08x", hr );
+ msg_Err( p_intf, "ThumbBarAddButtons failed with error %08lx", hr );
}
CONNECT( THEMIM->getIM(), playingStatusChanged( int ), this, changeThumbbarButtons( int ) );
}
{
if (msg->message == taskbar_wmsg)
{
- //We received the taskbarbuttoncreated, now we can really create th buttons
+ //We received the taskbarbuttoncreated, now we can really create the buttons
createTaskBarButtons();
}
}
return false;
}
-#endif
-//moc doesn't know about #ifdef, so we have to build this method for every platform
-void MainInterface::changeThumbbarButtons( int i_status)
+void MainInterface::changeThumbbarButtons( int i_status )
{
-#ifdef WIN32
// Define an array of three buttons. These buttons provide images through an
// image list and also provide tooltips.
DWORD dwMask = THB_BITMAP | THB_FLAGS;
switch( i_status )
{
+ case OPENING_S:
case PLAYING_S:
{
thbButtons[0].dwFlags = THBF_ENABLED;
thbButtons[1].iBitmap = 1;
break;
}
+ case END_S:
case PAUSE_S:
+ case ERROR_S:
{
thbButtons[0].dwFlags = THBF_ENABLED;
thbButtons[1].dwFlags = THBF_ENABLED;
}
HRESULT hr = p_taskbl->vt->ThumbBarUpdateButtons(p_taskbl, this->winId(), 3, thbButtons);
if(S_OK != hr)
- msg_Err( p_intf, "ThumbBarUpdateButtons failed with error %08x", hr );
-#endif
+ msg_Err( p_intf, "ThumbBarUpdateButtons failed with error %08lx", hr );
}
-
-