MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-28 08:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

[library] Move clear_queue_on_stop_disable cfg option to library section

Browse Source 
Resolves #1430
This commit is contained in:
ejurgensen 2022-03-06 10:01:15 +01:00
parent 48051f6364
commit 92279ef33d
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
owntone.conf.in
View File

@ -219,6 +219,12 @@ library {
# playlist directory. OwnTone creates new playlists in this directory if only # playlist directory. OwnTone creates new playlists in this directory if only
# a playlist name is provided (requires "allow_modify_stored_playlists" set to true). # a playlist name is provided (requires "allow_modify_stored_playlists" set to true).
# default_playlist_directory = "" # default_playlist_directory = ""
# By default OwnTone will - like iTunes - clear the playqueue if
# playback stops. Setting clear_queue_on_stop_disable to true will keep
# the playlist like MPD does. Note that some dacp clients do not show
# the playqueue if playback is stopped.
# clear_queue_on_stop_disable = false
} }
# Local audio output # Local audio output
@ -410,12 +416,6 @@ mpd {
# clients and will need additional configuration in the MPD client to # clients and will need additional configuration in the MPD client to
# work). Set to 0 to disable serving artwork over http. # work). Set to 0 to disable serving artwork over http.
# http_port = 0 # http_port = 0
# By default OwnTone will - like iTunes - clear the playqueue if
# playback stops. Setting clear_queue_on_stop_disable to true will keep
# the playlist like MPD does. Note that some dacp clients do not show
# the playqueue if playback is stopped.
# clear_queue_on_stop_disable = false
} }
# SQLite configuration (allows to modify the operation of the SQLite databases) # SQLite configuration (allows to modify the operation of the SQLite databases)

3
src/conffile.c
View File

@ -117,6 +117,7 @@ static cfg_opt_t sec_library[] =
CFG_BOOL("rating_updates", cfg_false, CFGF_NONE), CFG_BOOL("rating_updates", cfg_false, CFGF_NONE),
CFG_BOOL("allow_modifying_stored_playlists", cfg_false, CFGF_NONE), CFG_BOOL("allow_modifying_stored_playlists", cfg_false, CFGF_NONE),
CFG_STR("default_playlist_directory", NULL, CFGF_NONE), CFG_STR("default_playlist_directory", NULL, CFGF_NONE),
CFG_BOOL("clear_queue_on_stop_disable", cfg_false, CFGF_NONE),
CFG_END() CFG_END()
}; };
@ -225,7 +226,7 @@ static cfg_opt_t sec_mpd[] =
{ {
CFG_INT("port", 6600, CFGF_NONE), CFG_INT("port", 6600, CFGF_NONE),
CFG_INT("http_port", 0, CFGF_NONE), CFG_INT("http_port", 0, CFGF_NONE),
CFG_BOOL("clear_queue_on_stop_disable", cfg_false, CFGF_NONE), CFG_BOOL("clear_queue_on_stop_disable", cfg_false, CFGF_NODEFAULT | CFGF_DEPRECATED),
CFG_BOOL("allow_modifying_stored_playlists", cfg_false, CFGF_NODEFAULT | CFGF_DEPRECATED), CFG_BOOL("allow_modifying_stored_playlists", cfg_false, CFGF_NODEFAULT | CFGF_DEPRECATED),
CFG_STR("default_playlist_directory", NULL, CFGF_NODEFAULT | CFGF_DEPRECATED), CFG_STR("default_playlist_directory", NULL, CFGF_NODEFAULT | CFGF_DEPRECATED),
CFG_END() CFG_END()

10
src/library.c
View File

@ -715,7 +715,15 @@ initscan()
listener_notify(LISTENER_UPDATE); listener_notify(LISTENER_UPDATE);
// Only clear the queue if enabled (default) in config // Only clear the queue if enabled (default) in config
clear_queue_disabled = cfg_getbool(cfg_getsec(cfg, "mpd"), "clear_queue_on_stop_disable"); clear_queue_disabled = cfg_getbool(cfg_getsec(cfg, "library"), "clear_queue_on_stop_disable");
/* Handle deprecated config options */
if (0 < cfg_opt_size(cfg_getopt(cfg_getsec(cfg, "mpd"), "clear_queue_on_stop_disable")))
{
DPRINTF(E_LOG, L_MPD, "Found deprecated option 'clear_queue_on_stop_disable' in section 'mpd', please update configuration file (move option to section 'library').\n");
clear_queue_disabled = cfg_getbool(cfg_getsec(cfg, "mpd"), "clear_queue_on_stop_disable");
}
if (!clear_queue_disabled) if (!clear_queue_disabled)
{ {
db_queue_clear(0); db_queue_clear(0);