mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 05:37:29 +02:00
Code Issues Releases Wiki Activity

* Mutex protect TrackData.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-06-07 08:55:53 +02:00
parent 8b68e83827
commit 162610bae5
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libtomahawk/TrackData.cpp
View File

@@ -46,9 +46,9 @@ QHash< QString, trackdata_wptr > TrackData::s_trackDatasByName = QHash< QString,
QHash< unsigned int, trackdata_wptr > TrackData::s_trackDatasById = QHash< unsigned int, trackdata_wptr >(); QHash< unsigned int, trackdata_wptr > TrackData::s_trackDatasById = QHash< unsigned int, trackdata_wptr >();
static QMutex s_datanameCacheMutex; static QMutex s_datanameCacheMutex;
static QMutex s_memberMutex;
static QReadWriteLock s_dataidMutex; static QReadWriteLock s_dataidMutex;
inline QString inline QString
cacheKey( const QString& artist, const QString& track ) cacheKey( const QString& artist, const QString& track )
{ {
@@ -257,8 +257,11 @@ TrackData::loadSocialActions()
void void
TrackData::setAllSocialActions( const QList< SocialAction >& socialActions ) TrackData::setAllSocialActions( const QList< SocialAction >& socialActions )
{ {
m_allSocialActions = socialActions; {
parseSocialActions(); QMutexLocker locker( &s_memberMutex );
m_allSocialActions = socialActions;
parseSocialActions();
}
emit socialActionsLoaded(); emit socialActionsLoaded();
} }
@@ -267,6 +270,7 @@ TrackData::setAllSocialActions( const QList< SocialAction >& socialActions )
QList< SocialAction > QList< SocialAction >
TrackData::allSocialActions() const TrackData::allSocialActions() const
{ {
QMutexLocker locker( &s_memberMutex );
return m_allSocialActions; return m_allSocialActions;
} }
@@ -292,6 +296,8 @@ TrackData::parseSocialActions()
bool bool
TrackData::loved() TrackData::loved()
{ {
QMutexLocker locker( &s_memberMutex );
if ( m_socialActionsLoaded ) if ( m_socialActionsLoaded )
{ {
return m_currentSocialActions[ "Love" ].toBool(); return m_currentSocialActions[ "Love" ].toBool();
@@ -341,8 +347,9 @@ TrackData::loadStats()
QList< Tomahawk::PlaybackLog > QList< Tomahawk::PlaybackLog >
TrackData::playbackHistory( const Tomahawk::source_ptr& source ) const TrackData::playbackHistory( const Tomahawk::source_ptr& source ) const
{ {
QList< Tomahawk::PlaybackLog > history; QMutexLocker locker( &s_memberMutex );
QList< Tomahawk::PlaybackLog > history;
foreach ( const PlaybackLog& log, m_playbackHistory ) foreach ( const PlaybackLog& log, m_playbackHistory )
{ {
if ( source.isNull() || log.source == source ) if ( source.isNull() || log.source == source )
@@ -358,7 +365,10 @@ TrackData::playbackHistory( const Tomahawk::source_ptr& source ) const
void void
TrackData::setPlaybackHistory( const QList< Tomahawk::PlaybackLog >& playbackData ) TrackData::setPlaybackHistory( const QList< Tomahawk::PlaybackLog >& playbackData )
{ {
m_playbackHistory = playbackData; {
QMutexLocker locker( &s_memberMutex );
m_playbackHistory = playbackData;
}
emit statsLoaded(); emit statsLoaded();
} }
@@ -366,6 +376,8 @@ TrackData::setPlaybackHistory( const QList< Tomahawk::PlaybackLog >& playbackDat
unsigned int unsigned int
TrackData::playbackCount( const source_ptr& source ) TrackData::playbackCount( const source_ptr& source )
{ {
QMutexLocker locker( &s_memberMutex );
unsigned int count = 0; unsigned int count = 0;
foreach ( const PlaybackLog& log, m_playbackHistory ) foreach ( const PlaybackLog& log, m_playbackHistory )
{ {