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

fix not getting more tracks when restarting a failed station

Browse Source
This commit is contained in:
Leo Franchi
2011-03-09 20:28:34 -05:00
parent b57e9fbf54
commit 288da2be79
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libtomahawk/playlist/dynamic/DynamicModel.cpp
View File

@@ -23,11 +23,11 @@ using namespace Tomahawk;
DynamicModel::DynamicModel( QObject* parent ) DynamicModel::DynamicModel( QObject* parent )
: PlaylistModel( parent ) : PlaylistModel( parent )
, m_startOnResolved( false )
, m_onDemandRunning( false ) , m_onDemandRunning( false )
, m_changeOnNext( false ) , m_changeOnNext( false )
, m_searchingForNext( false ) , m_searchingForNext( false )
, m_filterUnresolvable( true ) , m_filterUnresolvable( true )
, m_startingAfterFailed( false )
, m_currentAttempts( 0 ) , m_currentAttempts( 0 )
, m_lastResolvedRow( 0 ) , m_lastResolvedRow( 0 )
{ {
@@ -69,7 +69,6 @@ DynamicModel::startOnDemand()
m_playlist->generator()->startOnDemand(); m_playlist->generator()->startOnDemand();
m_onDemandRunning = true; m_onDemandRunning = true;
m_startOnResolved = false; // not anymore---user clicks a track to start it
} }
void void
@@ -111,10 +110,6 @@ DynamicModel::trackResolved( bool resolved )
Query* q = qobject_cast<Query*>(sender()); Query* q = qobject_cast<Query*>(sender());
qDebug() << "Got successful resolved track:" << q->track() << q->artist() << m_lastResolvedRow << m_currentAttempts; qDebug() << "Got successful resolved track:" << q->track() << q->artist() << m_lastResolvedRow << m_currentAttempts;
if( m_startOnResolved ) { // on first start
m_startOnResolved = false;
AudioEngine::instance()->play();
}
if( m_currentAttempts > 0 ) { if( m_currentAttempts > 0 ) {
qDebug() << "EMITTING AN ASK FOR COLLAPSE:" << m_lastResolvedRow << m_currentAttempts; qDebug() << "EMITTING AN ASK FOR COLLAPSE:" << m_lastResolvedRow << m_currentAttempts;
@@ -133,7 +128,9 @@ DynamicModel::trackResolveFinished( bool success )
Query* q = qobject_cast<Query*>(sender()); Query* q = qobject_cast<Query*>(sender());
qDebug() << "Got not resolved track:" << q->track() << q->artist() << m_lastResolvedRow << m_currentAttempts; qDebug() << "Got not resolved track:" << q->track() << q->artist() << m_lastResolvedRow << m_currentAttempts;
m_currentAttempts++; m_currentAttempts++;
if( m_currentAttempts < 20 ) {
int curAttempts = m_startingAfterFailed ? m_currentAttempts - 20 : m_currentAttempts; // if we just failed, m_currentAttempts includes those failures
if( curAttempts < 20 ) {
qDebug() << "FETCHING MORE!"; qDebug() << "FETCHING MORE!";
m_playlist->generator()->fetchNext(); m_playlist->generator()->fetchNext();
} else { } else {

2
src/libtomahawk/playlist/dynamic/DynamicModel.h
View File

@@ -78,12 +78,12 @@ private:
QList< query_ptr > m_toResolveList; QList< query_ptr > m_toResolveList;
QList< query_ptr > m_resolvedList; QList< query_ptr > m_resolvedList;
bool m_startOnResolved;
bool m_onDemandRunning; bool m_onDemandRunning;
bool m_changeOnNext; bool m_changeOnNext;
bool m_searchingForNext; bool m_searchingForNext;
bool m_firstTrackGenerated; bool m_firstTrackGenerated;
bool m_filterUnresolvable; bool m_filterUnresolvable;
bool m_startingAfterFailed;
int m_currentAttempts; int m_currentAttempts;
int m_lastResolvedRow; int m_lastResolvedRow;
}; };