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

Fix GetPlaylist and update network remote

Browse Source
This commit is contained in:
Arnaud Bienner 2013-05-11 23:59:51 +02:00
parent 5e6821dead
commit e9f14d9f8a
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/networkremote/networkremote.cpp
View File

@ -133,8 +133,8 @@ void NetworkRemote::AcceptConnection() {
outgoing_data_creator_.get(), SLOT(ActiveChanged(Playlist*))); outgoing_data_creator_.get(), SLOT(ActiveChanged(Playlist*)));
connect(app_->playlist_manager(), SIGNAL(PlaylistChanged(Playlist*)), connect(app_->playlist_manager(), SIGNAL(PlaylistChanged(Playlist*)),
outgoing_data_creator_.get(), SLOT(PlaylistChanged(Playlist*))); outgoing_data_creator_.get(), SLOT(PlaylistChanged(Playlist*)));
connect(app_->playlist_manager(), SIGNAL(PlaylistAdded(int,QString)), connect(app_->playlist_manager(), SIGNAL(PlaylistAdded(int,QString,bool)),
outgoing_data_creator_.get(), SLOT(PlaylistAdded(int,QString))); outgoing_data_creator_.get(), SLOT(PlaylistAdded(int,QString,bool)));
connect(app_->playlist_manager(), SIGNAL(PlaylistRenamed(int,QString)), connect(app_->playlist_manager(), SIGNAL(PlaylistRenamed(int,QString)),
outgoing_data_creator_.get(), SLOT(PlaylistRenamed(int,QString))); outgoing_data_creator_.get(), SLOT(PlaylistRenamed(int,QString)));
connect(app_->playlist_manager(), SIGNAL(PlaylistClosed(int)), connect(app_->playlist_manager(), SIGNAL(PlaylistClosed(int)),

2
src/networkremote/outgoingdatacreator.cpp
View File

@ -166,7 +166,7 @@ void OutgoingDataCreator::ActiveChanged(Playlist* playlist) {
SendDataToClients(&msg); SendDataToClients(&msg);
} }
void OutgoingDataCreator::PlaylistAdded(int id, const QString& name) { void OutgoingDataCreator::PlaylistAdded(int id, const QString& name, bool favorite) {
SendAllActivePlaylists(); SendAllActivePlaylists();
} }

2
src/networkremote/outgoingdatacreator.h
View File

@ -32,7 +32,7 @@ public slots:
void SendPlaylistSongs(int id); void SendPlaylistSongs(int id);
void PlaylistChanged(Playlist*); void PlaylistChanged(Playlist*);
void VolumeChanged(int volume); void VolumeChanged(int volume);
void PlaylistAdded(int id, const QString& name); void PlaylistAdded(int id, const QString& name, bool favorite);
void PlaylistDeleted(int id); void PlaylistDeleted(int id);
void PlaylistClosed(int id); void PlaylistClosed(int id);
void PlaylistRenamed(int id, const QString& new_name); void PlaylistRenamed(int id, const QString& new_name);

18
src/playlist/playlistbackend.cpp
View File

@ -48,6 +48,10 @@ PlaylistBackend::PlaylistBackend(Application* app, QObject* parent)
{ {
} }
PlaylistBackend::PlaylistList PlaylistBackend::GetAllPlaylists() {
return GetPlaylists(GetPlaylists_All);
}
PlaylistBackend::PlaylistList PlaylistBackend::GetAllOpenPlaylists() { PlaylistBackend::PlaylistList PlaylistBackend::GetAllOpenPlaylists() {
return GetPlaylists(GetPlaylists_OpenInUi); return GetPlaylists(GetPlaylists_OpenInUi);
} }
@ -62,16 +66,18 @@ PlaylistBackend::PlaylistList PlaylistBackend::GetPlaylists(GetPlaylistsFlags fl
PlaylistList ret; PlaylistList ret;
QString condition; QStringList condition_list;
if (flags & GetPlaylists_OpenInUi) { if (flags & GetPlaylists_OpenInUi) {
condition += "WHERE ui_order != -1"; condition_list << "ui_order != -1";
}
if (flags == GetPlaylists_All) {
condition += " AND ";
} }
if (flags & GetPlaylists_Favorite) { if (flags & GetPlaylists_Favorite) {
condition += "WHERE is_favorite != 0"; condition_list << "is_favorite != 0";
} }
QString condition;
if (!condition_list.isEmpty()) {
condition = " WHERE " + condition_list.join(" OR ");
}
QSqlQuery q("SELECT ROWID, name, last_played, dynamic_playlist_type," QSqlQuery q("SELECT ROWID, name, last_played, dynamic_playlist_type,"
" dynamic_playlist_data, dynamic_playlist_backend," " dynamic_playlist_data, dynamic_playlist_backend,"

1
src/playlist/playlistbackend.h
View File

@ -61,6 +61,7 @@ class PlaylistBackend : public QObject {
static const int kSongTableJoins; static const int kSongTableJoins;
PlaylistList GetAllPlaylists();
PlaylistList GetAllOpenPlaylists(); PlaylistList GetAllOpenPlaylists();
PlaylistList GetAllFavoritePlaylists(); PlaylistList GetAllFavoritePlaylists();
PlaylistBackend::Playlist GetPlaylist(int id); PlaylistBackend::Playlist GetPlaylist(int id);