mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-19 15:29:42 +01:00
Code Issues Releases Wiki Activity

Should really have put it here to begin with -- might well want persistence across restarts

Browse Source
This commit is contained in:
Jeff Mitchell 2011-11-06 12:36:48 -05:00
parent 1a541c43ad
commit 953a271bee
5 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libtomahawk/audio/audioengine.cpp
View File

@ -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) );

13
src/libtomahawk/tomahawksettings.cpp
View File

@ -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 );
}

9
src/libtomahawk/tomahawksettings.h
View File

@ -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 );

17
src/libtomahawk/utils/tomahawkutils.cpp
View File

@ -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

10
src/libtomahawk/utils/tomahawkutils.h
View File

@ -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