Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Ensure song items are shown on Favorited signal 

There was an issue where the song items were only being shown
from a fresh start up but not when the playlist was created. This fixes
that issue and refactors the AddPlaylist code
This commit is contained in:
Vikram Ambrose 2018-01-14 11:24:45 +02:00
parent fefea9de61
commit 5e065609b6
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/playlist/playlistlistcontainer.cpp
View File

@ -250,14 +250,7 @@ void PlaylistListContainer::SetApplication(Application* app) {
// Get all playlists, even ones that are hidden in the UI.
for (const PlaylistBackend::Playlist& p :
app->playlist_backend()->GetAllFavoritePlaylists()) {
QStandardItem* playlist_item = model_->NewPlaylist(p.name, p.id);
QStandardItem* parent_folder = model_->FolderByPath(p.ui_path);
parent_folder->appendRow(playlist_item);
for (const Song s : app->playlist_backend()->GetPlaylistSongs(p.id)) {
QStandardItem* track_item = model_->NewTrack(s);
track_item->setDragEnabled(false);
playlist_item->appendRow(track_item);
}
AddPlaylist(p.id,p.name,true,&p.ui_path);
}
}
@ -274,7 +267,7 @@ void PlaylistListContainer::NewFolderClicked() {
}
void PlaylistListContainer::AddPlaylist(int id, const QString& name,
bool favorite) {
bool favorite, const QString *ui_path) {
if (!favorite) {
return;
}
@ -285,11 +278,18 @@ void PlaylistListContainer::AddPlaylist(int id, const QString& name,
return;
}
const QString& ui_path = app_->playlist_manager()->playlist(id)->ui_path();
if(ui_path == nullptr)
ui_path = &app_->playlist_manager()->playlist(id)->ui_path();
QStandardItem* playlist_item = model_->NewPlaylist(name, id);
QStandardItem* parent_folder = model_->FolderByPath(ui_path);
QStandardItem* parent_folder = model_->FolderByPath(*ui_path);
parent_folder->appendRow(playlist_item);
for (const Song s : app_->playlist_backend()->GetPlaylistSongs(id)) {
QStandardItem* track_item = model_->NewTrack(s);
track_item->setDragEnabled(false);
playlist_item->appendRow(track_item);
}
}
void PlaylistListContainer::PlaylistRenamed(int id, const QString& new_name) {

2
src/playlist/playlistlistcontainer.h
View File

@ -59,7 +59,7 @@ class PlaylistListContainer : public QWidget {
// From the PlaylistManager
void PlaylistRenamed(int id, const QString& new_name);
// Add playlist if favorite == true
void AddPlaylist(int id, const QString& name, bool favorite);
void AddPlaylist(int id, const QString& name, bool favorite, const QString *ui_path = nullptr);
void RemovePlaylist(int id);
void SavePlaylist();
void PlaylistFavoriteStateChanged(int id, bool favorite);