mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-25 02:09:48 +01:00
Code Issues Releases Wiki Activity

* Use the new Artist API in ArtistInfoWidget.

Browse Source
This commit is contained in:
Christian Muehlhaeuser 2012-05-27 19:05:23 +02:00
parent d8c5dcc6ba
commit 70fa4b73d4
2 changed files with 34 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp
View File

@ -147,15 +147,29 @@ void
ArtistInfoWidget::load( const artist_ptr& artist )
{
if ( !m_artist.isNull() )
{
disconnect( m_artist.data(), SIGNAL( updated() ), this, SLOT( onArtistImageUpdated() ) );
disconnect( m_artist.data(), SIGNAL( similarArtistsLoaded() ), this, SLOT( onSimilarArtistsLoaded() ) );
disconnect( m_artist.data(), SIGNAL( albumsAdded( QList<Tomahawk::album_ptr>, Tomahawk::ModelMode ) ),
this, SLOT( onAlbumsFound( QList<Tomahawk::album_ptr>, Tomahawk::ModelMode ) ) );
disconnect( m_artist.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr>, Tomahawk::ModelMode, Tomahawk::collection_ptr ) ),
this, SLOT( onTracksFound( QList<Tomahawk::query_ptr>, Tomahawk::ModelMode ) ) );
}
m_artist = artist;
m_title = artist->name();
connect( artist.data(), SIGNAL( albumsAdded( QList<Tomahawk::album_ptr>, Tomahawk::ModelMode ) ),
SLOT( onAlbumsFound( QList<Tomahawk::album_ptr>, Tomahawk::ModelMode ) ) );
connect( m_artist.data(), SIGNAL( similarArtistsLoaded() ), SLOT( onSimilarArtistsLoaded() ) );
connect( m_artist.data(), SIGNAL( updated() ), SLOT( onArtistImageUpdated() ) );
connect( m_artist.data(), SIGNAL( albumsAdded( QList<Tomahawk::album_ptr>, Tomahawk::ModelMode ) ),
SLOT( onAlbumsFound( QList<Tomahawk::album_ptr>, Tomahawk::ModelMode ) ) );
connect( m_artist.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr>, Tomahawk::ModelMode, Tomahawk::collection_ptr ) ),
SLOT( onTracksFound( QList<Tomahawk::query_ptr>, Tomahawk::ModelMode ) ) );
onAlbumsFound( artist->albums( Mixed ), Mixed );
onTracksFound( m_artist->tracks(), Mixed );
onSimilarArtistsLoaded();
onArtistImageUpdated();
Tomahawk::InfoSystem::InfoStringHash artistInfo;
artistInfo["artist"] = artist->name();
@ -169,17 +183,6 @@ ArtistInfoWidget::load( const artist_ptr& artist )
Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( artistInfo );
requestData.type = Tomahawk::InfoSystem::InfoArtistSimilars;
requestData.requestId = TomahawkUtils::infosystemRequestId();
Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
requestData.type = Tomahawk::InfoSystem::InfoArtistSongs;
requestData.requestId = TomahawkUtils::infosystemRequestId();
Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
connect( m_artist.data(), SIGNAL( updated() ), SLOT( onArtistImageUpdated() ) );
onArtistImageUpdated();
}
@ -192,6 +195,22 @@ ArtistInfoWidget::onAlbumsFound( const QList<Tomahawk::album_ptr>& albums, Model
}
void
ArtistInfoWidget::onTracksFound( const QList<Tomahawk::query_ptr>& queries, ModelMode mode )
{
Q_UNUSED( mode );
m_topHitsModel->append( queries );
}
void
ArtistInfoWidget::onSimilarArtistsLoaded()
{
m_relatedModel->addArtists( m_artist->similarArtists() );
}
void
ArtistInfoWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
{
@ -227,37 +246,6 @@ ArtistInfoWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestD
break;
}
case InfoSystem::InfoArtistSongs:
{
const QStringList tracks = returnedData["tracks"].toStringList();
QList< query_ptr > queries;
int i = 0;
foreach ( const QString& track, tracks )
{
queries << Query::get( m_artist->name(), track, QString(), QString(), false );
if ( ++i == 15 )
break;
}
Pipeline::instance()->resolve( queries );
m_topHitsModel->append( queries );
break;
}
case InfoSystem::InfoArtistSimilars:
{
const QStringList artists = returnedData["artists"].toStringList();
QList<artist_ptr> al;
foreach ( const QString& artist, artists )
{
al << Artist::get( artist );
}
m_relatedModel->addArtists( al );
break;
}
default:
return;
}

2
src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h
View File

@ -95,6 +95,8 @@ private slots:
void onArtistImageUpdated();
void onAlbumsFound( const QList<Tomahawk::album_ptr>& albums, Tomahawk::ModelMode mode );
void onTracksFound( const QList<Tomahawk::query_ptr>& queries, Tomahawk::ModelMode mode );
void onSimilarArtistsLoaded();
void onLoadingStarted();
void onLoadingFinished();