Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Connect up signals for queuing tracks so that the view is updated correctly.

Browse Source 
Fixes issue #548
This commit is contained in:
John Maguire 2010-07-26 15:53:06 +00:00
parent b3d3bca314
commit 14dd723e3a
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/playlist/playlist.cpp
View File

@ -78,6 +78,10 @@ Playlist::Playlist(PlaylistBackend* backend, TaskManager* task_manager,
connect(queue_, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), connect(queue_, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
SLOT(TracksAboutToBeDequeued(QModelIndex,int,int))); SLOT(TracksAboutToBeDequeued(QModelIndex,int,int)));
connect(queue_, SIGNAL(rowsRemoved(QModelIndex,int,int)), SLOT(TracksDequeued())); connect(queue_, SIGNAL(rowsRemoved(QModelIndex,int,int)), SLOT(TracksDequeued()));
connect(queue_, SIGNAL(rowsInserted(const QModelIndex&, int, int)),
SLOT(TracksEnqueued(const QModelIndex&, int, int)));
connect(queue_, SIGNAL(layoutChanged()), SLOT(QueueLayoutChanged())); connect(queue_, SIGNAL(layoutChanged()), SLOT(QueueLayoutChanged()));
} }
@ -1103,20 +1107,26 @@ PlaylistItemList Playlist::library_items_by_id(int id) const {
void Playlist::TracksAboutToBeDequeued(const QModelIndex&, int begin, int end) { void Playlist::TracksAboutToBeDequeued(const QModelIndex&, int begin, int end) {
for (int i=begin ; i<=end ; ++i) { for (int i=begin ; i<=end ; ++i) {
temp_queue_change_indexes_ << queue_->mapToSource(queue_->index(i, Column_Title)); temp_dequeue_change_indexes_ << queue_->mapToSource(queue_->index(i, Column_Title));
} }
} }
void Playlist::TracksDequeued() { void Playlist::TracksDequeued() {
foreach (const QModelIndex& index, temp_queue_change_indexes_) { foreach (const QModelIndex& index, temp_dequeue_change_indexes_) {
emit dataChanged(index, index); emit dataChanged(index, index);
} }
temp_queue_change_indexes_.clear(); temp_dequeue_change_indexes_.clear();
}
void Playlist::TracksEnqueued(const QModelIndex&, int begin, int end) {
const QModelIndex& b = queue_->mapToSource(queue_->index(begin, Column_Title));
const QModelIndex& e = queue_->mapToSource(queue_->index(end, Column_Title));
emit dataChanged(b, e);
} }
void Playlist::QueueLayoutChanged() { void Playlist::QueueLayoutChanged() {
for (int i=0 ; i<queue_->rowCount() ; ++i) { for (int i=0 ; i<queue_->rowCount() ; ++i) {
const QModelIndex index = queue_->mapToSource(queue_->index(i, Column_Title)); const QModelIndex& index = queue_->mapToSource(queue_->index(i, Column_Title));
emit dataChanged(index, index); emit dataChanged(index, index);
} }
} }

3
src/playlist/playlist.h
View File

@ -200,13 +200,14 @@ class Playlist : public QAbstractListModel {
private slots: private slots:
void TracksAboutToBeDequeued(const QModelIndex&, int begin, int end); void TracksAboutToBeDequeued(const QModelIndex&, int begin, int end);
void TracksDequeued(); void TracksDequeued();
void TracksEnqueued(const QModelIndex&, int begin, int end);
void QueueLayoutChanged(); void QueueLayoutChanged();
private: private:
PlaylistFilter* proxy_; PlaylistFilter* proxy_;
Queue* queue_; Queue* queue_;
QList<QModelIndex> temp_queue_change_indexes_; QList<QModelIndex> temp_dequeue_change_indexes_;
PlaylistBackend* backend_; PlaylistBackend* backend_;
TaskManager* task_manager_; TaskManager* task_manager_;