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

Remove upcoming tracks not from selected but from playing item

Browse Source
This commit is contained in:
Leo Franchi
2011-11-25 14:34:08 -05:00
parent f9b18a9c26
commit ba80899ee5
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
View File

@@ -400,12 +400,26 @@ void
DynamicWidget::steeringChanged() DynamicWidget::steeringChanged()
{ {
// When steering changes, toss all the tracks that are upcoming, and re-fetch. // When steering changes, toss all the tracks that are upcoming, and re-fetch.
QModelIndex cur = m_view->currentIndex(); // We have to find the currently playing item
const int upcoming = m_view->proxyModel()->rowCount( QModelIndex() ) - 1 - cur.row(); QModelIndex playing;
for ( int i = 0; i < m_view->proxyModel()->rowCount( QModelIndex() ); ++i )
{
const QModelIndex cur = m_view->proxyModel()->index( i, 0, QModelIndex() );
TrackModelItem* item = m_view->proxyModel()->itemFromIndex( m_view->proxyModel()->mapToSource( cur ) );
if ( item && item->isPlaying() )
{
playing = cur;
break;
}
}
if ( !playing.isValid() )
return;
const int upcoming = m_view->proxyModel()->rowCount( QModelIndex() ) - 1 - playing.row();
tDebug() << "Removing tracks after current in station, found" << upcoming; tDebug() << "Removing tracks after current in station, found" << upcoming;
QModelIndexList toRemove; QModelIndexList toRemove;
for ( int i = cur.row() + 1; i < m_view->proxyModel()->rowCount( QModelIndex() ); i++ ) for ( int i = playing.row() + 1; i < m_view->proxyModel()->rowCount( QModelIndex() ); i++ )
{ {
toRemove << m_view->proxyModel()->index( i, 0, QModelIndex() ); toRemove << m_view->proxyModel()->index( i, 0, QModelIndex() );
} }

1
src/libtomahawk/playlist/trackmodelitem.cpp
View File

@@ -47,6 +47,7 @@ TrackModelItem::TrackModelItem( TrackModelItem* parent, QAbstractItemModel* mode
this->model = model; this->model = model;
childCount = 0; childCount = 0;
toberemoved = false; toberemoved = false;
m_isPlaying = false;
if ( parent ) if ( parent )
{ {