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

* Set m_finished when tracks are loaded in Artist- & AlbumPlaylistInterface.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-06-26 05:00:26 +02:00
parent 3a580faa1d
commit 03695c2bc4
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtomahawk/AlbumPlaylistInterface.cpp
View File

@@ -120,7 +120,7 @@ AlbumPlaylistInterface::tracks()
DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( m_collection ); DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( m_collection );
cmd->setAlbum( m_album ); cmd->setAlbum( m_album );
cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition ); cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition );
connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ), connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ),
SLOT( onTracksLoaded( QList<Tomahawk::query_ptr> ) ) ); SLOT( onTracksLoaded( QList<Tomahawk::query_ptr> ) ) );
@@ -188,7 +188,7 @@ AlbumPlaylistInterface::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData re
cmd->setAlbum( m_album ); cmd->setAlbum( m_album );
//this takes discnumber into account as well //this takes discnumber into account as well
cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition ); cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition );
connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ), connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ),
SLOT( onTracksLoaded( QList<Tomahawk::query_ptr> ) ) ); SLOT( onTracksLoaded( QList<Tomahawk::query_ptr> ) ) );
@@ -196,6 +196,7 @@ AlbumPlaylistInterface::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData re
} }
else else
{ {
m_finished = true;
emit tracksLoaded( m_mode, m_collection ); emit tracksLoaded( m_mode, m_collection );
} }
} }
@@ -212,5 +213,6 @@ AlbumPlaylistInterface::onTracksLoaded( const QList< query_ptr >& tracks )
else else
m_queries << tracks; m_queries << tracks;
m_finished = true;
emit tracksLoaded( m_mode, m_collection ); emit tracksLoaded( m_mode, m_collection );
} }

6
src/libtomahawk/ArtistPlaylistInterface.cpp
View File

@@ -118,7 +118,7 @@ ArtistPlaylistInterface::tracks()
DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( m_collection ); DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( m_collection );
cmd->setArtist( m_artist ); cmd->setArtist( m_artist );
cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition ); cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition );
connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ), connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ),
SLOT( onTracksLoaded( QList<Tomahawk::query_ptr> ) ) ); SLOT( onTracksLoaded( QList<Tomahawk::query_ptr> ) ) );
@@ -186,7 +186,7 @@ ArtistPlaylistInterface::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData r
cmd->setArtist( m_artist ); cmd->setArtist( m_artist );
//this takes discnumber into account as well //this takes discnumber into account as well
cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition ); cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition );
connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ), connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ),
SLOT( onTracksLoaded( QList<Tomahawk::query_ptr> ) ) ); SLOT( onTracksLoaded( QList<Tomahawk::query_ptr> ) ) );
@@ -194,6 +194,7 @@ ArtistPlaylistInterface::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData r
} }
else else
{ {
m_finished = true;
emit tracksLoaded( m_mode, m_collection ); emit tracksLoaded( m_mode, m_collection );
} }
} }
@@ -210,5 +211,6 @@ ArtistPlaylistInterface::onTracksLoaded( const QList< query_ptr >& tracks )
else else
m_queries << tracks; m_queries << tracks;
m_finished = true;
emit tracksLoaded( m_mode, m_collection ); emit tracksLoaded( m_mode, m_collection );
} }