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

Include preview tracks in deduper

Browse Source
This commit is contained in:
Leo Franchi
2011-10-17 17:44:57 -04:00
parent dd1071f180
commit a708f37cd6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,14 +97,11 @@ DynamicModel::newTrackGenerated( const Tomahawk::query_ptr& query )
{ {
if( m_onDemandRunning ) { if( m_onDemandRunning ) {
bool isDuplicate = false; bool isDuplicate = false;
qDebug() << "Deduping:" << query->track() << query->artist();
for ( int i = 0; i < m_deduper.size(); i++ ) for ( int i = 0; i < m_deduper.size(); i++ )
{ {
qDebug() << "Checking against:" << m_deduper[ i ].first << m_deduper[ i ].second;
if ( m_deduper[ i ].first == query->track() && m_deduper[ i ].second == query->artist() ) if ( m_deduper[ i ].first == query->track() && m_deduper[ i ].second == query->artist() )
isDuplicate = true; isDuplicate = true;
} }
qDebug() << "is dup?" << isDuplicate;
if ( isDuplicate ) if ( isDuplicate )
{ {
m_playlist->generator()->fetchNext(); m_playlist->generator()->fetchNext();
@@ -289,6 +286,9 @@ DynamicModel::addToPlaylist( const QList< query_ptr >& entries, bool clearFirst
if( clearFirst ) if( clearFirst )
clear(); clear();
foreach ( const query_ptr& q, entries )
m_deduper.append( QPair< QString, QString >( q->track(), q->artist() ) );
if( m_playlist->author()->isLocal() && m_playlist->mode() == Static ) { if( m_playlist->author()->isLocal() && m_playlist->mode() == Static ) {
m_playlist->addEntries( entries, m_playlist->currentrevision() ); m_playlist->addEntries( entries, m_playlist->currentrevision() );
} else { // read-only, so add tracks only in the GUI, not to the playlist itself } else { // read-only, so add tracks only in the GUI, not to the playlist itself