mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-04-14 13:01:53 +02:00
Code Issues Releases Wiki Activity

* Use new PlayableModel API throughout app.

Browse Source
This commit is contained in:
Christian Muehlhaeuser 2012-06-29 03:14:01 +02:00
parent d907a9fbc8
commit 6ec80761eb
13 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/AudioControls.cpp
View File

@ -85,7 +85,7 @@ AudioControls::AudioControls( QWidget* parent )
ui->socialButton->setPixmap( RESPATH "images/share.png" );
ui->loveButton->setPixmap( RESPATH "images/not-loved.png" );
ui->loveButton->setCheckable( true );
ui->socialButton->setFixedSize( QSize( 20, 20 ) );
ui->loveButton->setFixedSize( QSize( 20, 20 ) );
@ -588,7 +588,7 @@ AudioControls::droppedTracks( QList< query_ptr > tracks )
{
// queue and play the first no matter what
GlobalActionManager::instance()->handlePlayTrack( tracks.first() );
ViewManager::instance()->queue()->model()->append( tracks );
ViewManager::instance()->queue()->model()->appendQueries( tracks );
}
}

8
src/libtomahawk/ContextMenu.cpp
View File

@ -224,7 +224,7 @@ ContextMenu::onTriggered( int action )
case ActionCopyLink:
copyLink();
break;
case ActionPage:
openPage();
break;
@ -252,15 +252,15 @@ ContextMenu::addToQueue()
{
foreach ( const query_ptr& query, m_queries )
{
ViewManager::instance()->queue()->model()->append( query );
ViewManager::instance()->queue()->model()->appendQuery( query );
}
foreach ( const artist_ptr& artist, m_artists )
{
ViewManager::instance()->queue()->model()->append( artist );
ViewManager::instance()->queue()->model()->appendArtist( artist );
}
foreach ( const album_ptr& album, m_albums )
{
ViewManager::instance()->queue()->model()->append( album );
ViewManager::instance()->queue()->model()->appendAlbum( album );
}
ViewManager::instance()->showQueue();

8
src/libtomahawk/GlobalActionManager.cpp
View File

@ -553,7 +553,7 @@ GlobalActionManager::handleOpenCommand( const QUrl& url )
void
GlobalActionManager::handleOpenTrack( const query_ptr& q )
{
ViewManager::instance()->queue()->model()->append( q );
ViewManager::instance()->queue()->model()->appendQuery( q );
ViewManager::instance()->showQueue();
if ( !AudioEngine::instance()->isPlaying() && !AudioEngine::instance()->isPaused() )
@ -570,7 +570,7 @@ GlobalActionManager::handleOpenTracks( const QList< query_ptr >& queries )
if ( queries.isEmpty() )
return;
ViewManager::instance()->queue()->model()->append( queries );
ViewManager::instance()->queue()->model()->appendQueries( queries );
ViewManager::instance()->showQueue();
if ( !AudioEngine::instance()->isPlaying() && !AudioEngine::instance()->isPaused() )
@ -670,7 +670,7 @@ GlobalActionManager::doQueueAdd( const QStringList& parts, const QList< QPair< Q
Pipeline::instance()->resolve( q, true );
ViewManager::instance()->queue()->model()->append( q );
ViewManager::instance()->queue()->model()->appendQuery( q );
ViewManager::instance()->showQueue();
}
return true;
@ -1343,7 +1343,7 @@ GlobalActionManager::waitingForResolved( bool /* success */ )
AudioEngine::instance()->playItem( AudioEngine::instance()->playlist(), m_waitingToPlay->results().first() );
else
{
ViewManager::instance()->queue()->model()->append( m_waitingToPlay );
ViewManager::instance()->queue()->model()->appendQuery( m_waitingToPlay );
AudioEngine::instance()->play();
}
}

2
src/libtomahawk/context/pages/TopTracksContext.cpp
View File

@ -100,7 +100,7 @@ TopTracksContext::onTracksFound( const QList<Tomahawk::query_ptr>& queries, Mode
{
Q_UNUSED( mode );
m_topHitsModel->append( queries );
m_topHitsModel->appendQueries( queries );
}

2
src/libtomahawk/playlist/CustomPlaylistView.cpp
View File

@ -112,7 +112,7 @@ CustomPlaylistView::tracksGenerated( QList< query_ptr > tracks )
return;
m_model->clear();
m_model->append( newTracks );
m_model->appendQueries( newTracks );
}

5
src/libtomahawk/widgets/NewPlaylistWidget.cpp
View File

@ -125,10 +125,7 @@ NewPlaylistWidget::suggestionsFound()
m_suggestionsModel = new PlaylistModel( ui->suggestionsView );
ui->suggestionsView->setPlaylistModel( m_suggestionsModel );
foreach( const Tomahawk::query_ptr& query, m_queries )
{
m_suggestionsModel->append( query );
}
m_suggestionsModel->appendQueries( m_queries );
loader->deleteLater();
}

2
src/libtomahawk/widgets/NewReleasesWidget.cpp
View File

@ -356,7 +356,7 @@ NewReleasesWidget::newReleasesLoaded( ChartDataLoader* loader, const QList< albu
Q_ASSERT( m_albumModels.contains( chartId ) );
if ( m_albumModels.contains( chartId ) )
m_albumModels[ chartId ]->append( albums );
m_albumModels[ chartId ]->appendAlbums( albums );
m_workers.remove( loader );
loader->deleteLater();

6
src/libtomahawk/widgets/SearchWidget.cpp
View File

@ -124,7 +124,7 @@ SearchWidget::onResultsFound( const QList<Tomahawk::result_ptr>& results )
Tomahawk::query_ptr q = result->toQuery();
q->addResults( rl );
m_resultsModel->append( q );
m_resultsModel->appendQuery( q );
m_artists << result->artist();
m_albums << result->album();
@ -178,7 +178,7 @@ SearchWidget::sortArtists()
}
m_artistsModel->clear();
m_artistsModel->append( sortedArtists );
m_artistsModel->appendArtists( sortedArtists );
}
@ -205,5 +205,5 @@ SearchWidget::sortAlbums()
}
m_albumsModel->clear();
m_albumsModel->append( sortedAlbums );
m_albumsModel->appendAlbums( sortedAlbums );
}

6
src/libtomahawk/widgets/SocialPlaylistWidget.cpp
View File

@ -140,7 +140,7 @@ SocialPlaylistWidget::popularAlbumsFetched( QList< album_ptr > albums )
{
m_popularNewAlbumsModel->clear();
m_popularNewAlbumsModel->append( albums );
m_popularNewAlbumsModel->appendAlbums( albums );
}
@ -148,6 +148,6 @@ void
SocialPlaylistWidget::topForeignTracksFetched( QList< query_ptr > tracks )
{
m_topForeignTracksModel->clear();
foreach( const query_ptr& q, tracks )
m_topForeignTracksModel->append( q );
m_topForeignTracksModel->appendQueries( tracks );
}

4
src/libtomahawk/widgets/WhatsHotWidget.cpp
View File

@ -507,7 +507,7 @@ WhatsHotWidget::chartTracksLoaded( ChartDataLoader* loader, const QList< query_p
if ( m_trackModels.contains( chartId ) )
{
Pipeline::instance()->resolve( tracks );
m_trackModels[ chartId ]->append( tracks );
m_trackModels[ chartId ]->appendQueries( tracks );
m_trackModels[ chartId ]->finishLoading();
}
@ -524,7 +524,7 @@ WhatsHotWidget::chartAlbumsLoaded( ChartDataLoader* loader, const QList< album_p
if ( m_albumModels.contains( chartId ) )
{
m_albumModels[ chartId ]->append( albums );
m_albumModels[ chartId ]->appendAlbums( albums );
m_albumModels[ chartId ]->finishLoading();
}

2
src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
View File

@ -184,7 +184,7 @@ AlbumInfoWidget::gotAlbums( const QList<Tomahawk::album_ptr>& albums )
if ( al.contains( m_album ) )
al.removeAll( m_album );
m_albumsModel->append( al );
m_albumsModel->appendAlbums( al );
}

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

@ -251,7 +251,7 @@ ArtistInfoWidget::onAlbumsFound( const QList<Tomahawk::album_ptr>& albums, Model
{
Q_UNUSED( mode );
m_albumsModel->append( albums );
m_albumsModel->appendAlbums( albums );
}
@ -261,14 +261,14 @@ ArtistInfoWidget::onTracksFound( const QList<Tomahawk::query_ptr>& queries, Mode
Q_UNUSED( mode );
m_topHitsModel->finishLoading();
m_topHitsModel->append( queries );
m_topHitsModel->appendQueries( queries );
}
void
ArtistInfoWidget::onSimilarArtistsLoaded()
{
m_relatedModel->append( m_artist->similarArtists() );
m_relatedModel->appendArtists( m_artist->similarArtists() );
}

2
src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp
View File

@ -244,7 +244,7 @@ TrackInfoWidget::onSimilarArtistsLoaded()
void
TrackInfoWidget::onSimilarTracksLoaded()
{
m_relatedTracksModel->append( m_query->similarTracks() );
m_relatedTracksModel->appendQueries( m_query->similarTracks() );
m_relatedTracksModel->finishLoading();
}