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

Don't ask the infosystem for the same item data more than once racily

Browse Source
This commit is contained in:
Leo Franchi
2012-04-06 14:55:03 -04:00
parent 1a7f2cc070
commit 2be9dfc45b
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libtomahawk/album.cpp
View File

@@ -78,6 +78,7 @@ Album::Album( unsigned int id, const QString& name, const Tomahawk::artist_ptr&
, m_name( name ) , m_name( name )
, m_artist( artist ) , m_artist( artist )
, m_infoLoaded( false ) , m_infoLoaded( false )
, m_infoLoading( false )
#ifndef ENABLE_HEADLESS #ifndef ENABLE_HEADLESS
, m_cover( 0 ) , m_cover( 0 )
#endif #endif
@@ -107,7 +108,7 @@ Album::artist() const
QPixmap QPixmap
Album::cover( const QSize& size, bool forceLoad ) const Album::cover( const QSize& size, bool forceLoad ) const
{ {
if ( !m_infoLoaded ) if ( !m_infoLoaded && !m_infoLoading )
{ {
if ( !forceLoad ) if ( !forceLoad )
return QPixmap(); return QPixmap();
@@ -133,6 +134,8 @@ Album::cover( const QSize& size, bool forceLoad ) const
SLOT( infoSystemFinished( QString ) ) ); SLOT( infoSystemFinished( QString ) ) );
Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData ); Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
m_infoLoading = true;
} }
if ( !m_cover && !m_coverBuffer.isEmpty() ) if ( !m_cover && !m_coverBuffer.isEmpty() )

1
src/libtomahawk/album.h
View File

@@ -76,6 +76,7 @@ private:
artist_ptr m_artist; artist_ptr m_artist;
QByteArray m_coverBuffer; QByteArray m_coverBuffer;
bool m_infoLoaded; bool m_infoLoaded;
mutable bool m_infoLoading;
mutable QString m_uuid; mutable QString m_uuid;
#ifndef ENABLE_HEADLESS #ifndef ENABLE_HEADLESS

5
src/libtomahawk/artist.cpp
View File

@@ -77,6 +77,7 @@ Artist::Artist( unsigned int id, const QString& name )
, m_id( id ) , m_id( id )
, m_name( name ) , m_name( name )
, m_infoLoaded( false ) , m_infoLoaded( false )
, m_infoLoading( false )
#ifndef ENABLE_HEADLESS #ifndef ENABLE_HEADLESS
, m_cover( 0 ) , m_cover( 0 )
#endif #endif
@@ -99,7 +100,7 @@ Artist::onTracksAdded( const QList<Tomahawk::query_ptr>& tracks )
QPixmap QPixmap
Artist::cover( const QSize& size, bool forceLoad ) const Artist::cover( const QSize& size, bool forceLoad ) const
{ {
if ( !m_infoLoaded ) if ( !m_infoLoaded || !m_infoLoading )
{ {
if ( !forceLoad ) if ( !forceLoad )
return QPixmap(); return QPixmap();
@@ -123,6 +124,8 @@ Artist::cover( const QSize& size, bool forceLoad ) const
SLOT( infoSystemFinished( QString ) ) ); SLOT( infoSystemFinished( QString ) ) );
Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData ); Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
m_infoLoading = true;
} }
if ( !m_cover && !m_coverBuffer.isEmpty() ) if ( !m_cover && !m_coverBuffer.isEmpty() )

1
src/libtomahawk/artist.h
View File

@@ -75,6 +75,7 @@ private:
QString m_sortname; QString m_sortname;
QByteArray m_coverBuffer; QByteArray m_coverBuffer;
bool m_infoLoaded; bool m_infoLoaded;
mutable bool m_infoLoading;
mutable QString m_uuid; mutable QString m_uuid;
#ifndef ENABLE_HEADLESS #ifndef ENABLE_HEADLESS