mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 11:20:22 +02:00
Code Issues Releases Wiki Activity

* Let AudioEngine wait for a query to finish resolving and start playback asap.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-05-19 07:23:33 +02:00
parent 5f1564fd3d
commit 69f41c41e8
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libtomahawk/PlaylistInterface.h
View File

@@ -105,6 +105,8 @@ private:
QString m_filter;
};
};
}
Q_DECLARE_METATYPE( Tomahawk::playlistinterface_ptr )
#endif // PLAYLISTINTERFACE_H

18
src/libtomahawk/audio/AudioEngine.cpp
View File

@@ -579,9 +579,17 @@ AudioEngine::playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk:
void
AudioEngine::playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::query_ptr& query )
{
if ( !query.isNull() && query->numResults() )
if ( query->resolvingFinished() )
{
if ( query->numResults() )
playItem( playlist, query->results().first() );
}
else
{
_detail::Closure* closure = NewClosure( query.data(), SIGNAL( resolvingFinished( bool ) ),
const_cast<AudioEngine*>(this), SLOT( playItem( Tomahawk::playlistinterface_ptr, Tomahawk::query_ptr ) ), playlist, query );
}
}
void
@@ -604,18 +612,10 @@ AudioEngine::playItem( const Tomahawk::album_ptr& album )
{
playlistinterface_ptr pli = album->playlistInterface( Mixed );
if ( pli->trackCount() )
{
if ( pli->tracks().first()->resolvingFinished() )
{
playItem( pli, pli->tracks().first() );
}
else
{
_detail::Closure* closure = NewClosure( pli->tracks().first().data(), SIGNAL( resolvingFinished( bool ) ),
const_cast<AudioEngine*>(this), SLOT( playItem( Tomahawk::album_ptr ) ), album );
}
}
else
{
_detail::Closure* closure = NewClosure( album.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr>, Tomahawk::ModelMode, Tomahawk::collection_ptr ) ),
const_cast<AudioEngine*>(this), SLOT( playItem( Tomahawk::album_ptr ) ), album );