diff options
| author | Max Kellermann <max@musicpd.org> | 2018-07-17 23:34:45 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2018-07-17 23:40:14 +0200 |
| commit | 113141bf2a6b7a444477e140854ec58fc3fe4fb9 (patch) | |
| tree | a0b9a195ea390790b23f84361b076e81f8192e89 /src/queue | |
| parent | bcc1e51097b0bfac30f2ffb0d81c5b8a7cfd874f (diff) | |
StateFileConfig: add attribute "restore_paused"
Diffstat (limited to 'src/queue')
| -rw-r--r-- | src/queue/PlaylistState.cxx | 9 | ||||
| -rw-r--r-- | src/queue/PlaylistState.hxx | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/queue/PlaylistState.cxx b/src/queue/PlaylistState.cxx index 20668c5b0..33e701aca 100644 --- a/src/queue/PlaylistState.cxx +++ b/src/queue/PlaylistState.cxx @@ -27,12 +27,11 @@ #include "PlaylistError.hxx" #include "Playlist.hxx" #include "SingleMode.hxx" +#include "StateFileConfig.hxx" #include "queue/QueueSave.hxx" #include "fs/io/TextFile.hxx" #include "fs/io/BufferedOutputStream.hxx" #include "player/Control.hxx" -#include "config/Global.hxx" -#include "config/Option.hxx" #include "util/CharUtil.hxx" #include "util/StringAPI.hxx" #include "util/StringCompare.hxx" @@ -128,7 +127,8 @@ playlist_state_load(TextFile &file, const SongLoader &song_loader, } bool -playlist_state_restore(const char *line, TextFile &file, +playlist_state_restore(const StateFileConfig &config, + const char *line, TextFile &file, const SongLoader &song_loader, struct playlist &playlist, PlayerControl &pc) { @@ -183,8 +183,7 @@ playlist_state_restore(const char *line, TextFile &file, if (!playlist.queue.IsValidPosition(current)) current = 0; - if (state == PlayerState::PLAY && - config_get_bool(ConfigOption::RESTORE_PAUSED, false)) + if (state == PlayerState::PLAY && config.restore_paused) /* the user doesn't want MPD to auto-start playback after startup; fall back to "pause" */ diff --git a/src/queue/PlaylistState.hxx b/src/queue/PlaylistState.hxx index 0b4faf026..8c08a607b 100644 --- a/src/queue/PlaylistState.hxx +++ b/src/queue/PlaylistState.hxx @@ -25,6 +25,7 @@ #ifndef MPD_PLAYLIST_STATE_HXX #define MPD_PLAYLIST_STATE_HXX +struct StateFileConfig; struct playlist; struct PlayerControl; class TextFile; @@ -36,7 +37,8 @@ playlist_state_save(BufferedOutputStream &os, const playlist &playlist, PlayerControl &pc); bool -playlist_state_restore(const char *line, TextFile &file, +playlist_state_restore(const StateFileConfig &config, + const char *line, TextFile &file, const SongLoader &song_loader, playlist &playlist, PlayerControl &pc); |