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

playlist/flac: move code to ToSongEnumerator()

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

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

@ -34,6 +34,34 @@
#include <FLAC/metadata.h> #include <FLAC/metadata.h>
static auto
ToSongEnumerator(const char *uri,
const FLAC__StreamMetadata_CueSheet &c,
const unsigned sample_rate,
const FLAC__uint64 total_samples) noexcept
{
std::forward_list<DetachedSong> songs;
auto tail = songs.before_begin();
for (unsigned i = 0; i < c.num_tracks; ++i) {
const auto &track = c.tracks[i];
if (track.type != 0)
continue;
const FLAC__uint64 start = track.offset;
const FLAC__uint64 end = i + 1 < c.num_tracks
? c.tracks[i + 1].offset
: total_samples;
tail = songs.emplace_after(tail, uri);
auto &song = *tail;
song.SetStartTime(SongTime::FromScale(start, sample_rate));
song.SetEndTime(SongTime::FromScale(end, sample_rate));
}
return std::make_unique<MemorySongEnumerator>(std::move(songs));
}
static std::unique_ptr<SongEnumerator> static std::unique_ptr<SongEnumerator>
flac_playlist_open_uri(const char *uri, flac_playlist_open_uri(const char *uri,
gcc_unused Mutex &mutex) gcc_unused Mutex &mutex)
@ -61,27 +89,8 @@ flac_playlist_open_uri(const char *uri,
const unsigned sample_rate = streaminfo.data.stream_info.sample_rate; const unsigned sample_rate = streaminfo.data.stream_info.sample_rate;
const FLAC__uint64 total_samples = streaminfo.data.stream_info.total_samples; const FLAC__uint64 total_samples = streaminfo.data.stream_info.total_samples;
std::forward_list<DetachedSong> songs; return ToSongEnumerator(uri, cuesheet->data.cue_sheet,
auto tail = songs.before_begin(); sample_rate, total_samples);
const auto &c = cuesheet->data.cue_sheet;
for (unsigned i = 0; i < c.num_tracks; ++i) {
const auto &track = c.tracks[i];
if (track.type != 0)
continue;
const FLAC__uint64 start = track.offset;
const FLAC__uint64 end = i + 1 < c.num_tracks
? c.tracks[i + 1].offset
: total_samples;
tail = songs.emplace_after(tail, uri);
auto &song = *tail;
song.SetStartTime(SongTime::FromScale(start, sample_rate));
song.SetEndTime(SongTime::FromScale(end, sample_rate));
}
return std::make_unique<MemorySongEnumerator>(std::move(songs));
} }
static const char *const flac_playlist_suffixes[] = { static const char *const flac_playlist_suffixes[] = {