From 953a271beedde8740b9ca28bf387f97df79ea052 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <tomahawk@jefferai.org>
Date: Sun, 6 Nov 2011 12:36:48 -0500
Subject: [PATCH] Should really have put it here to begin with -- might well
 want persistence across restarts

---
 src/libtomahawk/audio/audioengine.cpp   |  4 ++--
 src/libtomahawk/tomahawksettings.cpp    | 13 +++++++++++++
 src/libtomahawk/tomahawksettings.h      |  9 +++++++++
 src/libtomahawk/utils/tomahawkutils.cpp | 17 -----------------
 src/libtomahawk/utils/tomahawkutils.h   | 10 ----------
 5 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/audioengine.cpp
index 720dadbe3..c0555c4f4 100644
--- a/src/libtomahawk/audio/audioengine.cpp
+++ b/src/libtomahawk/audio/audioengine.cpp
@@ -474,7 +474,7 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
             if ( TomahawkSettings::instance()->verboseNotifications() )
                     sendNowPlayingNotification();
             
-            if ( TomahawkUtils::privateListeningMode() != TomahawkUtils::FullyPrivate )
+            if ( TomahawkSettings::instance()->privateListeningMode() != TomahawkSettings::FullyPrivate )
             {
                 DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( m_currentTrack, DatabaseCommand_LogPlayback::Started );
                 Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
@@ -718,7 +718,7 @@ AudioEngine::setCurrentTrack( const Tomahawk::result_ptr& result )
     m_lastTrack = m_currentTrack;
     if ( !m_lastTrack.isNull() )
     {
-        if ( TomahawkUtils::privateListeningMode() == TomahawkUtils::PublicListening )
+        if ( TomahawkSettings::instance()->privateListeningMode() == TomahawkSettings::PublicListening )
         {
             DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( m_lastTrack, DatabaseCommand_LogPlayback::Finished, m_timeElapsed );
             Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
diff --git a/src/libtomahawk/tomahawksettings.cpp b/src/libtomahawk/tomahawksettings.cpp
index 6719f63b2..55f5ade9d 100644
--- a/src/libtomahawk/tomahawksettings.cpp
+++ b/src/libtomahawk/tomahawksettings.cpp
@@ -975,3 +975,16 @@ TomahawkSettings::setNowPlayingEnabled( bool enable )
 {
     setValue( "adium/enablenowplaying", enable );
 }
+
+TomahawkSettings::PrivateListeningMode
+TomahawkSettings::privateListeningMode() const
+{
+    return ( TomahawkSettings::PrivateListeningMode ) value( "privatelisteningmode", TomahawkSettings::PublicListening ).toInt();
+}
+
+
+void
+TomahawkSettings::setPrivateListeningMode( TomahawkSettings::PrivateListeningMode mode )
+{
+    setValue( "privatelisteningmode", mode );
+}
diff --git a/src/libtomahawk/tomahawksettings.h b/src/libtomahawk/tomahawksettings.h
index 27f18b698..511f14375 100644
--- a/src/libtomahawk/tomahawksettings.h
+++ b/src/libtomahawk/tomahawksettings.h
@@ -201,6 +201,15 @@ public:
     bool nowPlayingEnabled() const; // false by default
     void setNowPlayingEnabled( bool enable );
 
+    enum PrivateListeningMode
+    {
+        PublicListening,
+        NoLogPlayback,
+        FullyPrivate
+    };
+    PrivateListeningMode privateListeningMode() const;
+    void setPrivateListeningMode( PrivateListeningMode mode );
+    
 signals:
     void changed();
     void recentlyPlayedPlaylistAdded( const Tomahawk::playlist_ptr& playlist );
diff --git a/src/libtomahawk/utils/tomahawkutils.cpp b/src/libtomahawk/utils/tomahawkutils.cpp
index bb26bf78d..60a40979f 100644
--- a/src/libtomahawk/utils/tomahawkutils.cpp
+++ b/src/libtomahawk/utils/tomahawkutils.cpp
@@ -718,21 +718,4 @@ quint64 infosystemRequestId()
     return result;
 }
 
-
-static PrivateListeningMode s_privateListeningMode = PublicListening;
-
-PrivateListeningMode
-privateListeningMode()
-{
-    return s_privateListeningMode;
-}
-
-
-void
-setPrivateListeningMode( PrivateListeningMode mode )
-{
-    s_privateListeningMode = mode;
-}
-
-
 } // ns
diff --git a/src/libtomahawk/utils/tomahawkutils.h b/src/libtomahawk/utils/tomahawkutils.h
index 98bf2745c..924045a1d 100644
--- a/src/libtomahawk/utils/tomahawkutils.h
+++ b/src/libtomahawk/utils/tomahawkutils.h
@@ -48,13 +48,6 @@ namespace TomahawkUtils
         MediaTypeTrack
     };
 
-    enum PrivateListeningMode
-    {
-        PublicListening,
-        NoLogPlayback,
-        FullyPrivate
-    };
-
     class DLLEXPORT NetworkProxyFactory : public QNetworkProxyFactory
     {
     public:
@@ -119,9 +112,6 @@ namespace TomahawkUtils
     DLLEXPORT bool removeDirectory( const QString& dir );
 
     DLLEXPORT quint64 infosystemRequestId();
-
-    DLLEXPORT PrivateListeningMode privateListeningMode();
-    DLLEXPORT void setPrivateListeningMode( PrivateListeningMode mode );
 }
 
 #endif // TOMAHAWKUTILS_H