From d455270c05ba956dfa7802f621c391b4918f62ed Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <tomahawk@jefferai.org>
Date: Thu, 23 Jun 2011 15:12:06 -0400
Subject: [PATCH] Add (if verbose is turned on in config) play/stop
 notifications

---
 src/libtomahawk/audio/audioengine.cpp | 42 +++++++++++++++++++++------
 src/libtomahawk/tomahawksettings.cpp  | 14 +++++++++
 src/libtomahawk/tomahawksettings.h    |  3 ++
 3 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/audioengine.cpp
index e86a9b6d1..79fe2242c 100644
--- a/src/libtomahawk/audio/audioengine.cpp
+++ b/src/libtomahawk/audio/audioengine.cpp
@@ -22,6 +22,7 @@
 
 #include "playlistinterface.h"
 #include "sourceplaylistinterface.h"
+#include "tomahawksettings.h"
 
 #include "database/database.h"
 #include "database/databasecommand_logplayback.h"
@@ -153,8 +154,20 @@ AudioEngine::stop( bool sendNotification )
     emit stopped();
 
     if ( sendNotification )
+    {
+        Tomahawk::InfoSystem::InfoMap map;
+        map[ Tomahawk::InfoSystem::InfoNowStopped ] = QVariant();
+
+        if ( TomahawkSettings::instance()->verboseNotifications() )
+        {
+            Tomahawk::InfoSystem::InfoCriteriaHash stopInfo;
+            stopInfo["message"] = QString( "Tomahawk is stopped." );
+            map[ Tomahawk::InfoSystem::InfoNotifyUser ] = QVariant::fromValue< Tomahawk::InfoSystem::InfoCriteriaHash >( stopInfo );
+        }
+        
         Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo(
-            s_aeInfoIdentifier, Tomahawk::InfoSystem::InfoNowStopped, QVariant() );
+            s_aeInfoIdentifier, map );
+    }
 }
 
 
@@ -305,15 +318,26 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
             DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( m_currentTrack, DatabaseCommand_LogPlayback::Started );
             Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
 
-        Tomahawk::InfoSystem::InfoCriteriaHash 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::InfoCriteriaHash >( trackInfo ) );
+            Tomahawk::InfoSystem::InfoMap map;
 
+            Tomahawk::InfoSystem::InfoCriteriaHash trackInfo;
+            trackInfo["title"] = m_currentTrack->track();
+            trackInfo["artist"] = m_currentTrack->artist()->name();
+            trackInfo["album"] = m_currentTrack->album()->name();
+            map[ Tomahawk::InfoSystem::InfoNowPlaying ] = QVariant::fromValue< Tomahawk::InfoSystem::InfoCriteriaHash >( trackInfo );
+            
+            if ( TomahawkSettings::instance()->verboseNotifications() )
+            {
+                Tomahawk::InfoSystem::InfoCriteriaHash playInfo;
+                playInfo["message"] = QString( "Tomahawk is playing \"%1\" by %2 on album %3." )
+                    .arg( m_currentTrack->track() )
+                    .arg( m_currentTrack->artist()->name() )
+                    .arg( m_currentTrack->album()->name() );
+                map[ Tomahawk::InfoSystem::InfoNotifyUser ] = QVariant::fromValue< Tomahawk::InfoSystem::InfoCriteriaHash >( playInfo );
+            }
+            
+            Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo(
+                s_aeInfoIdentifier, map );
         }
     }
 
diff --git a/src/libtomahawk/tomahawksettings.cpp b/src/libtomahawk/tomahawksettings.cpp
index bc8a5d824..f92ee98c1 100644
--- a/src/libtomahawk/tomahawksettings.cpp
+++ b/src/libtomahawk/tomahawksettings.cpp
@@ -420,6 +420,20 @@ TomahawkSettings::setMainWindowSplitterState( const QByteArray& state )
 }
 
 
+bool
+TomahawkSettings::verboseNotifications() const
+{
+    return value( "ui/notifications/verbose", false ).toBool();
+}
+
+
+void
+TomahawkSettings::setVerboseNotifications( bool notifications )
+{
+    setValue( "ui/notifications/verbose", notifications );
+}
+
+
 QByteArray
 TomahawkSettings::playlistColumnSizes( const QString& playlistid ) const
 {
diff --git a/src/libtomahawk/tomahawksettings.h b/src/libtomahawk/tomahawksettings.h
index aaedcbb08..1ee60c975 100644
--- a/src/libtomahawk/tomahawksettings.h
+++ b/src/libtomahawk/tomahawksettings.h
@@ -66,6 +66,9 @@ public:
     QByteArray mainWindowSplitterState() const;
     void setMainWindowSplitterState( const QByteArray& state );
 
+    bool verboseNotifications() const;
+    void setVerboseNotifications( bool notifications );
+
     /// Playlist stuff
     QByteArray playlistColumnSizes( const QString& playlistid ) const;
     void setPlaylistColumnSizes( const QString& playlistid, const QByteArray& state );