mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 06:07:37 +02:00
Code Issues Releases Wiki Activity

removed broken test for THUMBBUTTON, as this would only be an issue on very old mingw versions

Browse Source
This commit is contained in:
Patrick von Reth
2014-01-09 10:01:28 +01:00
parent 53dd0848a6
commit 2df438d498
4 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libtomahawk/CMakeLists.txt
View File

@@ -434,16 +434,6 @@ IF(LIBATTICA_FOUND)
ENDIF(LIBATTICA_FOUND) ENDIF(LIBATTICA_FOUND)
IF( WIN32 ) IF( WIN32 )
# Check for the availability of the Thumbbutton
check_cxx_source_compiles( "
#include <shobjidl.h>
int main() {
THUMBBUTTON foo;
return 0;
}
"
HAVE_THUMBBUTTON )
SET( OS_SPECIFIC_LINK_LIBRARIES SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES} ${OS_SPECIFIC_LINK_LIBRARIES}
# System # System

1
src/tomahawk/Config.h.in
View File

@@ -10,7 +10,6 @@
#cmakedefine SNOW_LEOPARD #cmakedefine SNOW_LEOPARD
#cmakedefine LEOPARD #cmakedefine LEOPARD
#cmakedefine HAVE_SPARKLE #cmakedefine HAVE_SPARKLE
#cmakedefine HAVE_THUMBBUTTON
#cmakedefine WITH_BREAKPAD #cmakedefine WITH_BREAKPAD
#cmakedefine WITH_CRASHREPORTER #cmakedefine WITH_CRASHREPORTER

12
src/tomahawk/TomahawkWindow.cpp
View File

@@ -104,7 +104,6 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
, TomahawkUtils::DpiScaler( this ) , TomahawkUtils::DpiScaler( this )
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
, m_buttonCreatedID( RegisterWindowMessage( L"TaskbarButtonCreated" ) ) , m_buttonCreatedID( RegisterWindowMessage( L"TaskbarButtonCreated" ) )
#ifdef HAVE_THUMBBUTTON
, m_taskbarList( 0 ) , m_taskbarList( 0 )
#endif #endif
#endif #endif
@@ -509,7 +508,6 @@ TomahawkWindow::setupUpdateCheck()
bool bool
TomahawkWindow::setupWindowsButtons() TomahawkWindow::setupWindowsButtons()
{ {
#ifdef HAVE_THUMBBUTTON
const GUID IID_ITaskbarList3 = { 0xea1afb91,0x9e28,0x4b86, { 0x90,0xe9,0x9e,0x9f,0x8a,0x5e,0xef,0xaf } }; const GUID IID_ITaskbarList3 = { 0xea1afb91,0x9e28,0x4b86, { 0x90,0xe9,0x9e,0x9f,0x8a,0x5e,0xef,0xaf } };
HRESULT hr = S_OK; HRESULT hr = S_OK;
@@ -559,9 +557,6 @@ TomahawkWindow::setupWindowsButtons()
} }
return SUCCEEDED( hr ); return SUCCEEDED( hr );
#else // HAVE_THUMBBUTTON
return false;
#endif
} }
@@ -788,7 +783,6 @@ void
TomahawkWindow::audioStateChanged( AudioState newState, AudioState oldState ) TomahawkWindow::audioStateChanged( AudioState newState, AudioState oldState )
{ {
Q_UNUSED(oldState); Q_UNUSED(oldState);
#ifdef HAVE_THUMBBUTTON
if ( m_taskbarList == 0 ) if ( m_taskbarList == 0 )
return; return;
switch ( newState ) switch ( newState )
@@ -829,17 +823,12 @@ TomahawkWindow::audioStateChanged( AudioState newState, AudioState oldState )
} }
m_taskbarList->ThumbBarUpdateButtons( winId(), ARRAYSIZE( m_thumbButtons ), m_thumbButtons ); m_taskbarList->ThumbBarUpdateButtons( winId(), ARRAYSIZE( m_thumbButtons ), m_thumbButtons );
#else
Q_UNUSED( newState );
Q_UNUSED( oldState );
#endif // HAVE_THUMBBUTTON
} }
void void
TomahawkWindow::updateWindowsLoveButton() TomahawkWindow::updateWindowsLoveButton()
{ {
#ifdef HAVE_THUMBBUTTON
if ( m_taskbarList == 0 ) if ( m_taskbarList == 0 )
return; return;
if ( !AudioEngine::instance()->currentTrack().isNull() && AudioEngine::instance()->currentTrack()->track()->loved() ) if ( !AudioEngine::instance()->currentTrack().isNull() && AudioEngine::instance()->currentTrack()->track()->loved() )
@@ -855,7 +844,6 @@ TomahawkWindow::updateWindowsLoveButton()
m_thumbButtons[TP_LOVE].dwFlags = THBF_ENABLED; m_thumbButtons[TP_LOVE].dwFlags = THBF_ENABLED;
m_taskbarList->ThumbBarUpdateButtons( winId(), ARRAYSIZE( m_thumbButtons ), m_thumbButtons ); m_taskbarList->ThumbBarUpdateButtons( winId(), ARRAYSIZE( m_thumbButtons ), m_thumbButtons );
#endif // HAVE_THUMBBUTTON
} }

2
src/tomahawk/TomahawkWindow.h
View File

@@ -162,10 +162,8 @@ private:
bool setupWindowsButtons(); bool setupWindowsButtons();
const unsigned int m_buttonCreatedID; const unsigned int m_buttonCreatedID;
HICON thumbIcon(TomahawkUtils::ImageType type); HICON thumbIcon(TomahawkUtils::ImageType type);
#ifdef HAVE_THUMBBUTTON
ITaskbarList3* m_taskbarList; ITaskbarList3* m_taskbarList;
THUMBBUTTON m_thumbButtons[5]; THUMBBUTTON m_thumbButtons[5];
#endif
enum TB_STATES{ TP_PREVIOUS = 0,TP_PLAY_PAUSE = 1,TP_NEXT = 2,TP_LOVE = 4 }; enum TB_STATES{ TP_PREVIOUS = 0,TP_PLAY_PAUSE = 1,TP_NEXT = 2,TP_LOVE = 4 };
#endif #endif