From 413c3ed36ee6fcde86b47eca6f5b84ffa1f0fed4 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 22 Jan 2011 08:15:44 +0100 Subject: [PATCH] * Fixed merging mistake. --- CMakeLists.txt | 2 +- src/audiocontrols.cpp | 2 +- src/libtomahawk/audio/audioengine.cpp | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 73079fa95..c906746e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ ELSE() ENDIF() FIND_PACKAGE( Taglib 1.6.0 REQUIRED ) -FIND_PACKAGE( LibLastFm REQUIRED ) +FIND_PACKAGE( LibLastFm 0.3.3 REQUIRED ) FIND_PACKAGE( LibEchonest REQUIRED ) IF( UNIX AND NOT APPLE ) diff --git a/src/audiocontrols.cpp b/src/audiocontrols.cpp index de503d580..d02414e73 100644 --- a/src/audiocontrols.cpp +++ b/src/audiocontrols.cpp @@ -134,7 +134,7 @@ AudioControls::AudioControls( QWidget* parent ) connect( AudioEngine::instance(), SIGNAL( paused() ), SLOT( onPlaybackPaused() ) ); connect( AudioEngine::instance(), SIGNAL( resumed() ), SLOT( onPlaybackResumed() ) ); connect( AudioEngine::instance(), SIGNAL( stopped() ), SLOT( onPlaybackStopped() ) ); - connect( AudioEngine::instance(), SIGNAL( timerSeconds( unsigned int ) ), SLOT( onPlaybackTimer( unsigned int ) ) ); + connect( AudioEngine::instance(), SIGNAL( timerMilliSeconds( qint64 ) ), SLOT( onPlaybackTimer( qint64 ) ) ); connect( AudioEngine::instance(), SIGNAL( volumeChanged( int ) ), SLOT( onVolumeChanged( int ) ) ); m_defaultCover = QPixmap( RESPATH "images/no-album-art-placeholder.png" ) diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/audioengine.cpp index 30635973d..4836e5efd 100644 --- a/src/libtomahawk/audio/audioengine.cpp +++ b/src/libtomahawk/audio/audioengine.cpp @@ -45,12 +45,10 @@ AudioEngine::~AudioEngine() { qDebug() << Q_FUNC_INFO << "waiting for event loop to finish..."; - m_mediaObject->stop(); + stop(); delete m_audioOutput; delete m_mediaObject; - - m_input.clear(); }