mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-15 02:24:50 +02:00
Code Issues Releases Wiki Activity

* No need to check all results for playability. Their sorted by that, so we just check the first one.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-06-27 02:18:41 +02:00
parent 3fb403c695
commit fa4463dc88
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -604,13 +604,10 @@ AudioEngine::playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk:
{ {
if ( query->resolvingFinished() ) if ( query->resolvingFinished() )
{ {
foreach ( const result_ptr& result, query->results() ) if ( query->numResults() && query->results().first()->isOnline() )
{ {
if ( result->isOnline() ) playItem( playlist, query->results().first() );
{ return;
playItem( playlist, result );
return;
}
} }
JobStatusView::instance()->model()->addJob( JobStatusView::instance()->model()->addJob(
@@ -764,7 +761,7 @@ AudioEngine::onStateChanged( Phonon::State newState, Phonon::State oldState )
} }
} }
} }
if ( newState == Phonon::PausedState || newState == Phonon::PlayingState || newState == Phonon::ErrorState ) if ( newState == Phonon::PausedState || newState == Phonon::PlayingState || newState == Phonon::ErrorState )
{ {
tDebug() << "Phonon state now:" << newState; tDebug() << "Phonon state now:" << newState;
@@ -890,10 +887,10 @@ AudioEngine::checkStateQueue()
m_mediaObject->play(); m_mediaObject->play();
if ( paused ) if ( paused )
setVolume( m_volume ); setVolume( m_volume );
break; break;
} }
case Paused: case Paused:
{ {
m_volume = volume(); m_volume = volume();