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

Always map model indexes from the UI to the source playlist model when using them in the playlist.

Browse Source 
Update issue #340
Status: fixed
I think I've fixed all these bugs now, but please reopen if you find
another situation where the wrong track gets used in a filtered playlist.
This commit is contained in:
David Sansome 2010-05-25 19:39:04 +00:00
parent bfa355cf82
commit 7ecdb772a7
2 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/playlist/playlistview.cpp
View File

@ -379,7 +379,8 @@ void PlaylistView::JumpToCurrentlyPlayingTrack() {
if (playlist_->current_index() == -1)
return;
QModelIndex current = playlist_->index(playlist_->current_index(), 0);
QModelIndex current = playlist_->proxy()->mapFromSource(
playlist_->index(playlist_->current_index(), 0));
currently_autoscrolling_ = true;
// Scroll to the item

42
src/ui/mainwindow.cpp
View File

@ -579,8 +579,15 @@ void MainWindow::PlayIndex(const QModelIndex& index) {
if (!index.isValid())
return;
int row = index.row();
if (index.model() == playlists_->current()->proxy()) {
// The index was in the proxy model (might've been filtered), so we need
// to get the actual row in the source model.
row = playlists_->current()->proxy()->mapToSource(index).row();
}
playlists_->SetActiveToCurrent();
player_->PlayAt(index.row(), Engine::Manual, true);
player_->PlayAt(row, Engine::Manual, true);
}
void MainWindow::LoadLibraryItemToPlaylist(const QModelIndex& index) {
@ -606,6 +613,11 @@ void MainWindow::AddLibraryItemToPlaylist(bool clear_first, const QModelIndex& i
QModelIndex first_song = playlists_->current()->InsertLibraryItems(
library_->model()->GetChildSongs(idx));
if (!playlists_->current()->proxy()->mapFromSource(first_song).isValid()) {
// The first song doesn't match the filter, so don't play it
return;
}
if (first_song.isValid() && player_->GetState() != Engine::Playing) {
playlists_->SetActiveToCurrent();
player_->PlayAt(first_song.row(), Engine::First, true);
@ -733,6 +745,11 @@ void MainWindow::RadioDoubleClick(const QModelIndex& index) {
playlists_->current()->dropMimeData(data.get(), Qt::CopyAction, -1, 0, QModelIndex());
QModelIndex first_song = playlists_->current()->index(0, 0);
if (!playlists_->current()->proxy()->mapFromSource(first_song).isValid()) {
// The first song doesn't match the filter, so don't play it
return;
}
if (first_song.isValid() && player_->GetState() != Engine::Playing) {
playlists_->SetActiveToCurrent();
player_->PlayAt(first_song.row(), Engine::First, true);
@ -743,6 +760,11 @@ void MainWindow::InsertRadioItem(RadioItem* item) {
QModelIndex first_song = playlists_->current()->InsertRadioStations(
QList<RadioItem*>() << item);
if (!playlists_->current()->proxy()->mapFromSource(first_song).isValid()) {
// The first song doesn't match the filter, so don't play it
return;
}
if (first_song.isValid() && player_->GetState() != Engine::Playing) {
playlists_->SetActiveToCurrent();
player_->PlayAt(first_song.row(), Engine::First, true);
@ -752,6 +774,11 @@ void MainWindow::InsertRadioItem(RadioItem* item) {
void MainWindow::InsertRadioItems(const PlaylistItemList& items) {
QModelIndex first_song = playlists_->current()->InsertItems(items);
if (!playlists_->current()->proxy()->mapFromSource(first_song).isValid()) {
// The first song doesn't match the filter, so don't play it
return;
}
if (first_song.isValid() && player_->GetState() != Engine::Playing) {
playlists_->SetActiveToCurrent();
player_->PlayAt(first_song.row(), Engine::First, true);
@ -826,13 +853,13 @@ void MainWindow::PlaylistPlay() {
if (playlists_->current()->current_index() == playlist_menu_index_.row()) {
player_->PlayPause();
} else {
playlists_->SetActiveToCurrent();
player_->PlayAt(playlist_menu_index_.row(), Engine::Manual, true);
PlayIndex(playlist_menu_index_);
}
}
void MainWindow::PlaylistStopAfter() {
playlists_->current()->StopAfter(playlist_menu_index_.row());
playlists_->current()->StopAfter(
playlists_->current()->proxy()->mapToSource(playlist_menu_index_).row());
}
void MainWindow::EditTracks() {
@ -843,7 +870,8 @@ void MainWindow::EditTracks() {
ui_->playlist->view()->selectionModel()->selection().indexes()) {
if (index.column() != 0)
continue;
Song song = playlists_->current()->item_at(index.row())->Metadata();
int row = playlists_->current()->proxy()->mapToSource(index).row();
Song song = playlists_->current()->item_at(row)->Metadata();
if (song.IsEditable()) {
songs << song;
@ -878,7 +906,7 @@ void MainWindow::RenumberTracks() {
if (index.column() != 0)
continue;
int row = index.row();
int row = playlists_->current()->proxy()->mapToSource(index).row();
Song song = playlists_->current()->item_at(row)->Metadata();
if (song.IsEditable()) {
@ -899,7 +927,7 @@ void MainWindow::SelectionSetValue() {
if (index.column() != 0)
continue;
int row = index.row();
int row = playlists_->current()->proxy()->mapToSource(index).row();
Song song = playlists_->current()->item_at(row)->Metadata();
if(Playlist::set_column_value(song, column, column_value)) {