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

decoder/flac: handle unknown duration correctly

Browse Source 
If the duration is unknown, pass SignedSongTime::Negative(), as
documented for decoder_initialized().
This commit is contained in:
Max Kellermann
2016-07-08 22:33:49 +02:00
parent 7f36923eb4
commit 4a7042e847
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/decoder/plugins/FlacCommon.hxx
View File

@@ -55,9 +55,7 @@ struct flac_data : public FlacInput {
AudioFormat audio_format;
/**
* The total number of frames in this song. The decoder
* plugin may initialize this attribute to override the value
* provided by libFLAC (e.g. for sub songs from a CUE sheet).
* The total number of frames in this song. 0 means unknown.
*/
FLAC__uint64 total_frames;

7
src/decoder/plugins/FlacDecoderPlugin.cxx
View File

@@ -145,9 +145,10 @@ flac_decoder_initialize(struct flac_data *data, FLAC__StreamDecoder *sd,
if (data->initialized) {
/* done */
const auto duration2 =
SignedSongTime::FromScale<uint64_t>(data->total_frames,
data->audio_format.sample_rate);
const auto duration2 = data->total_frames > 0
? SignedSongTime::FromScale<uint64_t>(data->total_frames,
data->audio_format.sample_rate)
: SignedSongTime::Negative();
decoder_initialized(data->decoder, data->audio_format,
data->input_stream.IsSeekable(),