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

* Renamed infoLoaded() to coverLoaded().

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-05-27 17:33:38 +02:00
parent b2b7fc4a4e
commit 33cae66d95
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libtomahawk/Album.cpp
View File

@@ -82,8 +82,8 @@ Album::Album( unsigned int id, const QString& name, const Tomahawk::artist_ptr&
, m_id( id ) , m_id( id )
, m_name( name ) , m_name( name )
, m_artist( artist ) , m_artist( artist )
, m_infoLoaded( false ) , m_coverLoaded( false )
, m_infoLoading( false ) , m_coverLoading( false )
#ifndef ENABLE_HEADLESS #ifndef ENABLE_HEADLESS
, m_cover( 0 ) , m_cover( 0 )
#endif #endif
@@ -110,7 +110,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 && !m_infoLoading ) if ( !m_coverLoaded && !m_coverLoading )
{ {
if ( !forceLoad ) if ( !forceLoad )
return QPixmap(); return QPixmap();
@@ -137,7 +137,7 @@ Album::cover( const QSize& size, bool forceLoad ) const
Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData ); Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
m_infoLoading = true; m_coverLoading = true;
} }
if ( !m_cover && !m_coverBuffer.isEmpty() ) if ( !m_cover && !m_coverBuffer.isEmpty() )
@@ -202,7 +202,7 @@ Album::infoSystemFinished( const QString& target )
disconnect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ), disconnect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ),
this, SLOT( infoSystemFinished( QString ) ) ); this, SLOT( infoSystemFinished( QString ) ) );
m_infoLoaded = true; m_coverLoaded = true;
emit updated(); emit updated();
} }

6
src/libtomahawk/Album.h
View File

@@ -56,7 +56,7 @@ public:
#ifndef ENABLE_HEADLESS #ifndef ENABLE_HEADLESS
QPixmap cover( const QSize& size, bool forceLoad = true ) const; QPixmap cover( const QSize& size, bool forceLoad = true ) const;
#endif #endif
bool infoLoaded() const { return m_infoLoaded; } bool coverLoaded() const { return m_coverLoaded; }
QList<Tomahawk::query_ptr> tracks( ModelMode mode = Mixed, const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr() ); QList<Tomahawk::query_ptr> tracks( ModelMode mode = Mixed, const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr() );
Tomahawk::playlistinterface_ptr playlistInterface( ModelMode mode, const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr() ); Tomahawk::playlistinterface_ptr playlistInterface( ModelMode mode, const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr() );
@@ -85,8 +85,8 @@ private:
artist_ptr m_artist; artist_ptr m_artist;
QByteArray m_coverBuffer; QByteArray m_coverBuffer;
bool m_infoLoaded; bool m_coverLoaded;
mutable bool m_infoLoading; mutable bool m_coverLoading;
mutable QString m_uuid; mutable QString m_uuid;
#ifndef ENABLE_HEADLESS #ifndef ENABLE_HEADLESS