oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

db/simple: add an AudioFormat to each Song

Browse Source
This commit is contained in:
Max Kellermann
2018-07-06 13:22:17 +02:00
parent c05bca6f2c
commit 72b6c09a73
11 changed files with 68 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/db/plugins/simple/DirectorySave.cxx
View File

@@ -161,10 +161,15 @@ directory_load(TextFile &file, Directory &directory)
if (directory.FindSong(name) != nullptr)
throw FormatRuntimeError("Duplicate song '%s'", name);
auto song = song_load(file, name);
auto audio_format = AudioFormat::Undefined();
auto detached_song = song_load(file, name,
&audio_format);
directory.AddSong(Song::NewFrom(std::move(*song),
directory));
auto song = Song::NewFrom(std::move(*detached_song),
directory);
song->audio_format = audio_format;
directory.AddSong(song);
} else if ((p = StringAfterPrefix(line, PLAYLIST_META_BEGIN))) {
const char *name = p;
playlist_metadata_load(file, directory.playlists, name);