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

playlist/flac: read the file only once using FLAC__Metadata_Chain

Browse Source
This commit is contained in:
Max Kellermann 2019-08-15 10:27:02 +02:00
parent 5894514ccb
commit 34246eb7fd
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/playlist/plugins/FlacPlaylistPlugin.cxx
View File

@ -26,10 +26,13 @@
#include "FlacPlaylistPlugin.hxx" #include "FlacPlaylistPlugin.hxx"
#include "../PlaylistPlugin.hxx" #include "../PlaylistPlugin.hxx"
#include "../MemorySongEnumerator.hxx" #include "../MemorySongEnumerator.hxx"
#include "lib/xiph/FlacMetadataChain.hxx"
#include "lib/xiph/FlacMetadataIterator.hxx"
#include "song/DetachedSong.hxx" #include "song/DetachedSong.hxx"
#include "fs/Traits.hxx" #include "fs/Traits.hxx"
#include "fs/AllocatedPath.hxx" #include "fs/AllocatedPath.hxx"
#include "fs/NarrowPath.hxx" #include "fs/NarrowPath.hxx"
#include "util/RuntimeError.hxx"
#include "util/ScopeExit.hxx" #include "util/ScopeExit.hxx"
#include <FLAC/metadata.h> #include <FLAC/metadata.h>
@ -74,23 +77,37 @@ flac_playlist_open_uri(const char *uri,
const NarrowPath narrow_path_fs(path_fs); const NarrowPath narrow_path_fs(path_fs);
FLAC__StreamMetadata *cuesheet; FlacMetadataChain chain;
if (!FLAC__metadata_get_cuesheet(narrow_path_fs, &cuesheet)) if (!chain.Read(narrow_path_fs))
return nullptr; throw FormatRuntimeError("Failed to read FLAC metadata: %s",
chain.GetStatusString());
AtScopeExit(cuesheet) { FLAC__metadata_object_delete(cuesheet); }; FlacMetadataIterator iterator((FLAC__Metadata_Chain *)chain);
FLAC__StreamMetadata streaminfo; unsigned sample_rate = 0;
if (!FLAC__metadata_get_streaminfo(narrow_path_fs, &streaminfo) || FLAC__uint64 total_samples;
streaminfo.data.stream_info.sample_rate == 0) {
return nullptr;
}
const unsigned sample_rate = streaminfo.data.stream_info.sample_rate; do {
const FLAC__uint64 total_samples = streaminfo.data.stream_info.total_samples; auto &block = *iterator.GetBlock();
switch (block.type) {
case FLAC__METADATA_TYPE_STREAMINFO:
sample_rate = block.data.stream_info.sample_rate;
total_samples = block.data.stream_info.total_samples;
break;
return ToSongEnumerator(uri, cuesheet->data.cue_sheet, case FLAC__METADATA_TYPE_CUESHEET:
sample_rate, total_samples); if (sample_rate == 0)
break;
return ToSongEnumerator(uri, block.data.cue_sheet,
sample_rate, total_samples);
default:
break;
}
} while (iterator.Next());
return nullptr;
} }
static const char *const flac_playlist_suffixes[] = { static const char *const flac_playlist_suffixes[] = {