From 1a541c43ad824a9c2bd0b5de3d11f4cc7e3569b3 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Sat, 5 Nov 2011 20:31:10 -0400 Subject: [PATCH] Add in the hooks to control when listening information is sent. Now just need a UI for it... --- src/libtomahawk/audio/audioengine.cpp | 36 ++++++++++++++++----------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/audioengine.cpp index c92be1f37..720dadbe3 100644 --- a/src/libtomahawk/audio/audioengine.cpp +++ b/src/libtomahawk/audio/audioengine.cpp @@ -471,21 +471,24 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result ) m_mediaObject->play(); emit started( m_currentTrack ); - DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( m_currentTrack, DatabaseCommand_LogPlayback::Started ); - Database::instance()->enqueue( QSharedPointer(cmd) ); - - Tomahawk::InfoSystem::InfoStringHash trackInfo; - trackInfo["title"] = m_currentTrack->track(); - trackInfo["artist"] = m_currentTrack->artist()->name(); - trackInfo["album"] = m_currentTrack->album()->name(); - if ( TomahawkSettings::instance()->verboseNotifications() ) - sendNowPlayingNotification(); + sendNowPlayingNotification(); + + if ( TomahawkUtils::privateListeningMode() != TomahawkUtils::FullyPrivate ) + { + DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( m_currentTrack, DatabaseCommand_LogPlayback::Started ); + Database::instance()->enqueue( QSharedPointer(cmd) ); - Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( - s_aeInfoIdentifier, - Tomahawk::InfoSystem::InfoNowPlaying, - QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo ) ); + Tomahawk::InfoSystem::InfoStringHash trackInfo; + trackInfo["title"] = m_currentTrack->track(); + trackInfo["artist"] = m_currentTrack->artist()->name(); + trackInfo["album"] = m_currentTrack->album()->name(); + + Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( + s_aeInfoIdentifier, + Tomahawk::InfoSystem::InfoNowPlaying, + QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo ) ); + } } } @@ -715,8 +718,11 @@ AudioEngine::setCurrentTrack( const Tomahawk::result_ptr& result ) m_lastTrack = m_currentTrack; if ( !m_lastTrack.isNull() ) { - DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( m_lastTrack, DatabaseCommand_LogPlayback::Finished, m_timeElapsed ); - Database::instance()->enqueue( QSharedPointer(cmd) ); + if ( TomahawkUtils::privateListeningMode() == TomahawkUtils::PublicListening ) + { + DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( m_lastTrack, DatabaseCommand_LogPlayback::Finished, m_timeElapsed ); + Database::instance()->enqueue( QSharedPointer(cmd) ); + } emit finished( m_lastTrack ); }