core/playlists/system: Clean up saving playlists
This prevents double-saves in both the playlist entrance function and in the overridden function. Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
This commit is contained in:
parent
6fc965e80d
commit
d33245f604
|
@ -70,35 +70,15 @@ static bool sys_pl_generic_add(struct playlist *playlist, struct track *track)
|
||||||
/*
|
/*
|
||||||
* Favorite tracks playlist operations.
|
* Favorite tracks playlist operations.
|
||||||
*/
|
*/
|
||||||
static bool sys_pl_favorites_add(struct playlist *playlist, struct track *track)
|
|
||||||
{
|
|
||||||
bool ret = playlist_generic_add_track(playlist, track);
|
|
||||||
__sys_pl_save();
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool sys_pl_favorites_remove(struct playlist *playlist, struct track *track)
|
|
||||||
{
|
|
||||||
bool ret = playlist_generic_remove_track(playlist, track);
|
|
||||||
__sys_pl_save();
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void sys_pl_favorites_clear(struct playlist *playlist)
|
|
||||||
{
|
|
||||||
playlist_generic_clear(playlist);
|
|
||||||
__sys_pl_save();
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct sys_playlist sys_favorites = {
|
static struct sys_playlist sys_favorites = {
|
||||||
.spl_playlist = DEFINE_PLAYLIST(PL_SYSTEM, "Favorites"),
|
.spl_playlist = DEFINE_PLAYLIST(PL_SYSTEM, "Favorites"),
|
||||||
.spl_init = playlist_generic_init,
|
.spl_init = playlist_generic_init,
|
||||||
.spl_save = sys_pl_save_full,
|
.spl_save = sys_pl_save_full,
|
||||||
.spl_load = sys_pl_load_full,
|
.spl_load = sys_pl_load_full,
|
||||||
.spl_can_select = playlist_generic_can_select,
|
.spl_can_select = playlist_generic_can_select,
|
||||||
.spl_add = sys_pl_favorites_add,
|
.spl_add = playlist_generic_add_track,
|
||||||
.spl_remove = sys_pl_favorites_remove,
|
.spl_remove = playlist_generic_remove_track,
|
||||||
.spl_clear = sys_pl_favorites_clear,
|
.spl_clear = playlist_generic_clear,
|
||||||
.spl_set_flag = playlist_generic_set_flag,
|
.spl_set_flag = playlist_generic_set_flag,
|
||||||
.spl_sort = playlist_generic_sort,
|
.spl_sort = playlist_generic_sort,
|
||||||
.spl_next = playlist_generic_next,
|
.spl_next = playlist_generic_next,
|
||||||
|
@ -115,12 +95,10 @@ static bool sys_pl_hidden_add(struct playlist *playlist, struct track *track)
|
||||||
pl_system_remove_track("Unplayed", track);
|
pl_system_remove_track("Unplayed", track);
|
||||||
pl_system_remove_track("Most Played", track);
|
pl_system_remove_track("Most Played", track);
|
||||||
pl_system_remove_track("Least Played", track);
|
pl_system_remove_track("Least Played", track);
|
||||||
__sys_pl_save();
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool sys_pl_hidden_on_remove(struct playlist *playlist,
|
static bool sys_pl_hidden_remove(struct playlist *playlist, struct track *track)
|
||||||
struct track *track)
|
|
||||||
{
|
{
|
||||||
bool ret = playlist_generic_remove_track(playlist, track);
|
bool ret = playlist_generic_remove_track(playlist, track);
|
||||||
pl_system_add_track("Collection", track);
|
pl_system_add_track("Collection", track);
|
||||||
|
@ -130,22 +108,14 @@ static inline bool sys_pl_hidden_on_remove(struct playlist *playlist,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool sys_pl_hidden_remove(struct playlist *playlist, struct track *track)
|
|
||||||
{
|
|
||||||
bool ret = sys_pl_hidden_on_remove(playlist, track);
|
|
||||||
__sys_pl_save();
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void sys_pl_hidden_clear(struct playlist *playlist)
|
static void sys_pl_hidden_clear(struct playlist *playlist)
|
||||||
{
|
{
|
||||||
struct track *track;
|
struct track *track;
|
||||||
|
|
||||||
while (queue_size(&playlist->pl_queue) > 0) {
|
while (queue_size(&playlist->pl_queue) > 0) {
|
||||||
track = queue_at(&playlist->pl_queue, 0);
|
track = queue_at(&playlist->pl_queue, 0);
|
||||||
sys_pl_hidden_on_remove(playlist, track);
|
sys_pl_hidden_remove(playlist, track);
|
||||||
}
|
}
|
||||||
__sys_pl_save();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct sys_playlist sys_hidden = {
|
static struct sys_playlist sys_hidden = {
|
||||||
|
@ -195,52 +165,18 @@ static void sys_pl_queued_init(struct playlist *playlist,
|
||||||
queue_init(&playlist->pl_queue, Q_ENABLED, ops, playlist);
|
queue_init(&playlist->pl_queue, Q_ENABLED, ops, playlist);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool sys_pl_queued_add(struct playlist *playlist, struct track *track)
|
|
||||||
{
|
|
||||||
bool ret = playlist_generic_add_track(playlist, track);
|
|
||||||
__sys_pl_save();
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool sys_pl_queued_remove(struct playlist *playlist, struct track *track)
|
|
||||||
{
|
|
||||||
bool ret = playlist_generic_remove_track(playlist, track);
|
|
||||||
__sys_pl_save();
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void sys_pl_queued_clear(struct playlist *playlist)
|
|
||||||
{
|
|
||||||
playlist_generic_clear(playlist);
|
|
||||||
__sys_pl_save();
|
|
||||||
}
|
|
||||||
|
|
||||||
static void sys_pl_queued_set_flag(struct playlist *playlist,
|
|
||||||
enum queue_flags flag, bool enabled)
|
|
||||||
{
|
|
||||||
playlist_generic_set_flag(playlist, flag, enabled);
|
|
||||||
__sys_pl_save();
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct track *sys_pl_queued_next(struct playlist *playlist)
|
|
||||||
{
|
|
||||||
struct track *track = playlist_generic_next(playlist);
|
|
||||||
__sys_pl_save();
|
|
||||||
return track;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct sys_playlist sys_queued = {
|
static struct sys_playlist sys_queued = {
|
||||||
.spl_playlist = DEFINE_PLAYLIST(PL_SYSTEM, "Queued Tracks"),
|
.spl_playlist = DEFINE_PLAYLIST(PL_SYSTEM, "Queued Tracks"),
|
||||||
.spl_init = sys_pl_queued_init,
|
.spl_init = sys_pl_queued_init,
|
||||||
.spl_save = sys_pl_save_full,
|
.spl_save = sys_pl_save_full,
|
||||||
.spl_load = sys_pl_load_full,
|
.spl_load = sys_pl_load_full,
|
||||||
.spl_can_select = playlist_noop_can_select,
|
.spl_can_select = playlist_noop_can_select,
|
||||||
.spl_add = sys_pl_queued_add,
|
.spl_add = playlist_generic_add_track,
|
||||||
.spl_remove = sys_pl_queued_remove,
|
.spl_remove = playlist_generic_remove_track,
|
||||||
.spl_clear = sys_pl_queued_clear,
|
.spl_clear = playlist_generic_clear,
|
||||||
.spl_set_flag = sys_pl_queued_set_flag,
|
.spl_set_flag = playlist_generic_set_flag,
|
||||||
.spl_sort = playlist_generic_sort,
|
.spl_sort = playlist_generic_sort,
|
||||||
.spl_next = sys_pl_queued_next,
|
.spl_next = playlist_generic_next,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -282,20 +218,6 @@ static bool sys_pl_collection_update(struct playlist *playlist,
|
||||||
return sys_pl_generic_add(playlist, track) || true;
|
return sys_pl_generic_add(playlist, track) || true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void sys_pl_collection_set_flag(struct playlist *playlist,
|
|
||||||
enum queue_flags flag, bool enabled)
|
|
||||||
{
|
|
||||||
playlist_generic_set_flag(playlist, flag, enabled);
|
|
||||||
__sys_pl_save();
|
|
||||||
}
|
|
||||||
|
|
||||||
static void sys_pl_collection_sort(struct playlist *playlist,
|
|
||||||
enum compare_t sort, bool reset)
|
|
||||||
{
|
|
||||||
playlist_generic_sort(playlist, sort, reset);
|
|
||||||
__sys_pl_save();
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct sys_playlist sys_collection = {
|
static struct sys_playlist sys_collection = {
|
||||||
.spl_playlist = DEFINE_PLAYLIST(PL_SYSTEM, "Collection"),
|
.spl_playlist = DEFINE_PLAYLIST(PL_SYSTEM, "Collection"),
|
||||||
.spl_init = sys_pl_update_init,
|
.spl_init = sys_pl_update_init,
|
||||||
|
@ -306,8 +228,8 @@ static struct sys_playlist sys_collection = {
|
||||||
.spl_remove = playlist_generic_remove_track,
|
.spl_remove = playlist_generic_remove_track,
|
||||||
.spl_clear = playlist_noop_clear,
|
.spl_clear = playlist_noop_clear,
|
||||||
.spl_update = sys_pl_collection_update,
|
.spl_update = sys_pl_collection_update,
|
||||||
.spl_set_flag = sys_pl_collection_set_flag,
|
.spl_set_flag = playlist_generic_set_flag,
|
||||||
.spl_sort = sys_pl_collection_sort,
|
.spl_sort = playlist_generic_sort,
|
||||||
.spl_next = playlist_generic_next,
|
.spl_next = playlist_generic_next,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -595,21 +517,37 @@ static bool pl_system_new(const gchar *name)
|
||||||
static bool pl_system_delete(const gchar *name)
|
static bool pl_system_delete(const gchar *name)
|
||||||
{
|
{
|
||||||
struct sys_playlist *sys_pl = __sys_pl_lookup(name);
|
struct sys_playlist *sys_pl = __sys_pl_lookup(name);
|
||||||
if (sys_pl)
|
if (sys_pl) {
|
||||||
sys_pl->spl_clear(&sys_pl->spl_playlist);
|
sys_pl->spl_clear(&sys_pl->spl_playlist);
|
||||||
|
__sys_pl_save();
|
||||||
|
}
|
||||||
return false; /* Don't remove the playlist from the sidebar. */
|
return false; /* Don't remove the playlist from the sidebar. */
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool pl_system_add_track(const gchar *name, struct track *track)
|
static bool pl_system_add_track(const gchar *name, struct track *track)
|
||||||
{
|
{
|
||||||
struct sys_playlist *sys_pl = __sys_pl_lookup(name);
|
struct sys_playlist *sys_pl = __sys_pl_lookup(name);
|
||||||
return sys_pl ? sys_pl->spl_add(&sys_pl->spl_playlist, track) : false;
|
bool ret = false;
|
||||||
|
|
||||||
|
if (sys_pl) {
|
||||||
|
ret = sys_pl->spl_add(&sys_pl->spl_playlist, track);
|
||||||
|
if (ret)
|
||||||
|
__sys_pl_save();
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool pl_system_remove_track(const gchar *name, struct track *track)
|
static bool pl_system_remove_track(const gchar *name, struct track *track)
|
||||||
{
|
{
|
||||||
struct sys_playlist *sys_pl = __sys_pl_lookup(name);
|
struct sys_playlist *sys_pl = __sys_pl_lookup(name);
|
||||||
return sys_pl ? sys_pl->spl_remove(&sys_pl->spl_playlist, track) : false;
|
bool ret = false;
|
||||||
|
|
||||||
|
if (sys_pl) {
|
||||||
|
ret = sys_pl->spl_remove(&sys_pl->spl_playlist, track);
|
||||||
|
if (ret)
|
||||||
|
__sys_pl_save();
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pl_system_update(const gchar *name)
|
static void pl_system_update(const gchar *name)
|
||||||
|
|
Loading…
Reference in New Issue