mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 23:57:34 +02:00
Code Issues Releases Wiki Activity

* Use PlayableModel's new currentIndex methods.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-12-23 08:13:23 +01:00
parent 96b9f38b2e
commit 93951bfdd4
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libtomahawk/playlist/PlayableProxyModel.cpp
View File

@@ -108,6 +108,7 @@ PlayableProxyModel::setSourcePlayableModel( PlayableModel* sourceModel )
disconnect( m_model, SIGNAL( loadingFinished() ), this, SIGNAL( loadingFinished() ) ); disconnect( m_model, SIGNAL( loadingFinished() ), this, SIGNAL( loadingFinished() ) );
disconnect( m_model, SIGNAL( itemCountChanged( unsigned int ) ), this, SIGNAL( itemCountChanged( unsigned int ) ) ); disconnect( m_model, SIGNAL( itemCountChanged( unsigned int ) ), this, SIGNAL( itemCountChanged( unsigned int ) ) );
disconnect( m_model, SIGNAL( indexPlayable( QModelIndex ) ), this, SLOT( onIndexPlayable( QModelIndex ) ) ); disconnect( m_model, SIGNAL( indexPlayable( QModelIndex ) ), this, SLOT( onIndexPlayable( QModelIndex ) ) );
disconnect( m_model, SIGNAL( currentIndexChanged() ), this, SIGNAL( currentIndexChanged() ) );
} }
m_model = sourceModel; m_model = sourceModel;
@@ -118,6 +119,7 @@ PlayableProxyModel::setSourcePlayableModel( PlayableModel* sourceModel )
connect( m_model, SIGNAL( loadingFinished() ), SIGNAL( loadingFinished() ) ); connect( m_model, SIGNAL( loadingFinished() ), SIGNAL( loadingFinished() ) );
connect( m_model, SIGNAL( itemCountChanged( unsigned int ) ), SIGNAL( itemCountChanged( unsigned int ) ) ); connect( m_model, SIGNAL( itemCountChanged( unsigned int ) ), SIGNAL( itemCountChanged( unsigned int ) ) );
connect( m_model, SIGNAL( indexPlayable( QModelIndex ) ), SLOT( onIndexPlayable( QModelIndex ) ) ); connect( m_model, SIGNAL( indexPlayable( QModelIndex ) ), SLOT( onIndexPlayable( QModelIndex ) ) );
connect( m_model, SIGNAL( currentIndexChanged() ), SIGNAL( currentIndexChanged() ) );
} }
QSortFilterProxyModel::setSourceModel( m_model ); QSortFilterProxyModel::setSourceModel( m_model );
@@ -632,8 +634,7 @@ void
PlayableProxyModel::setCurrentIndex( const QModelIndex& index ) PlayableProxyModel::setCurrentIndex( const QModelIndex& index )
{ {
tDebug() << Q_FUNC_INFO; tDebug() << Q_FUNC_INFO;
m_model->setCurrentItem( mapToSource( index ) ); m_model->setCurrentIndex( mapToSource( index ) );
emit currentIndexChanged();
} }

2
src/libtomahawk/playlist/PlaylistModel.cpp
View File

@@ -270,7 +270,7 @@ PlaylistModel::insertEntries( const QList< Tomahawk::plentry_ptr >& entries, int
i++; i++;
if ( entry->query()->id() == currentItemUuid() ) if ( entry->query()->id() == currentItemUuid() )
setCurrentItem( plitem->index ); setCurrentIndex( plitem->index );
if ( !entry->query()->resolvingFinished() && !entry->query()->playable() ) if ( !entry->query()->resolvingFinished() && !entry->query()->playable() )
{ {