diff --git a/src/scrobbler.cpp b/src/scrobbler.cpp index ef599db76..bbdb0e26f 100644 --- a/src/scrobbler.cpp +++ b/src/scrobbler.cpp @@ -43,6 +43,18 @@ Scrobbler::Scrobbler( QObject* parent ) SLOT( infoSystemInfo( QString, Tomahawk::InfoSystem::InfoType, QVariant, QVariant, Tomahawk::InfoSystem::InfoCustomData ) ) ); connect( TomahawkApp::instance()->infoSystem(), SIGNAL( finished( QString ) ), SLOT( infoSystemFinished( QString ) ) ); + + connect( AudioEngine::instance(), SIGNAL( started( const Tomahawk::result_ptr& ) ), + SLOT( trackStarted( const Tomahawk::result_ptr& ) ), Qt::QueuedConnection ); + + connect( AudioEngine::instance(), SIGNAL( paused() ), + SLOT( trackPaused() ), Qt::QueuedConnection ); + + connect( AudioEngine::instance(), SIGNAL( resumed() ), + SLOT( trackResumed() ), Qt::QueuedConnection ); + + connect( AudioEngine::instance(), SIGNAL( stopped() ), + SLOT( trackStopped() ), Qt::QueuedConnection ); } @@ -143,4 +155,4 @@ Scrobbler::infoSystemFinished( QString target ) qDebug() << Q_FUNC_INFO; qDebug() << "Scrobbler received done signal from InfoSystem"; } -} \ No newline at end of file +} diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp index e7ae74a45..11fa147c2 100644 --- a/src/tomahawkapp.cpp +++ b/src/tomahawkapp.cpp @@ -225,17 +225,6 @@ TomahawkApp::init() qDebug() << "Setting NAM."; TomahawkUtils::setNam( new lastfm::NetworkAccessManager( this ) ); - connect( m_audioEngine, SIGNAL( started( const Tomahawk::result_ptr& ) ), - m_scrobbler, SLOT( trackStarted( const Tomahawk::result_ptr& ) ), Qt::QueuedConnection ); - - connect( m_audioEngine, SIGNAL( paused() ), - m_scrobbler, SLOT( trackPaused() ), Qt::QueuedConnection ); - - connect( m_audioEngine, SIGNAL( resumed() ), - m_scrobbler, SLOT( trackResumed() ), Qt::QueuedConnection ); - - connect( m_audioEngine, SIGNAL( stopped() ), - m_scrobbler, SLOT( trackStopped() ), Qt::QueuedConnection ); #else qDebug() << "Setting NAM."; TomahawkUtils::setNam( new QNetworkAccessManager );