diff options
| author | Max Kellermann <max@duempel.org> | 2014-02-03 22:25:54 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-02-03 23:32:31 +0100 |
| commit | 5ad2980d69409b5f307dcea57f2107bbcfcffc70 (patch) | |
| tree | 7bfd99e03b333376f9eec5f2e07111e6d28ecd3e /src/PlaylistState.cxx | |
| parent | ca36ac2ba196ee2bbe4b54ee9a71d49174803277 (diff) | |
| download | mpd-5ad2980d69409b5f307dcea57f2107bbcfcffc70.tar.gz mpd-5ad2980d69409b5f307dcea57f2107bbcfcffc70.tar.xz mpd-5ad2980d69409b5f307dcea57f2107bbcfcffc70.zip | |
QueueSave: use class SongLoader
Diffstat (limited to '')
| -rw-r--r-- | src/PlaylistState.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/PlaylistState.cxx b/src/PlaylistState.cxx index 4a4e37345..f5c798e3e 100644 --- a/src/PlaylistState.cxx +++ b/src/PlaylistState.cxx @@ -103,7 +103,8 @@ playlist_state_save(FILE *fp, const struct playlist &playlist, } static void -playlist_state_load(TextFile &file, struct playlist &playlist) +playlist_state_load(TextFile &file, const SongLoader &song_loader, + struct playlist &playlist) { const char *line = file.ReadLine(); if (line == nullptr) { @@ -112,7 +113,7 @@ playlist_state_load(TextFile &file, struct playlist &playlist) } while (!StringStartsWith(line, PLAYLIST_STATE_FILE_PLAYLIST_END)) { - queue_load_song(file, line, playlist.queue); + queue_load_song(file, song_loader, line, playlist.queue); line = file.ReadLine(); if (line == nullptr) { @@ -128,6 +129,7 @@ playlist_state_load(TextFile &file, struct playlist &playlist) bool playlist_state_restore(const char *line, TextFile &file, + const SongLoader &song_loader, struct playlist &playlist, PlayerControl &pc) { int current = -1; @@ -183,7 +185,7 @@ playlist_state_restore(const char *line, TextFile &file, (PLAYLIST_STATE_FILE_CURRENT)])); } else if (StringStartsWith(line, PLAYLIST_STATE_FILE_PLAYLIST_BEGIN)) { - playlist_state_load(file, playlist); + playlist_state_load(file, song_loader, playlist); } } |