Commit ca252804 authored by Max Kellermann's avatar Max Kellermann

DecoderControl: use SignedSongTime for the song duration

parent 7c25d83f
......@@ -450,7 +450,7 @@ Player::CheckDecoderStartup()
return true;
pc.Lock();
pc.total_time = real_song_duration(*dc.song, dc.total_time);
pc.total_time = real_song_duration(*dc.song, dc.total_time.ToDoubleS());
pc.audio_format = dc.in_audio_format;
pc.Unlock();
......@@ -1001,7 +1001,7 @@ Player::Run()
calculate how many chunks will be required
for it */
cross_fade_chunks =
pc.cross_fade.Calculate(dc.total_time,
pc.cross_fade.Calculate(dc.total_time.ToDoubleS(),
dc.replay_gain_db,
dc.replay_gain_prev_db,
dc.GetMixRampStart(),
......
......@@ -59,7 +59,9 @@ decoder_initialized(Decoder &decoder,
dc.out_audio_format = getOutputAudioFormat(audio_format);
dc.seekable = seekable;
dc.total_time = total_time;
dc.total_time = total_time > 0
? SignedSongTime::FromS(total_time)
: SignedSongTime::Negative();
FormatDebug(decoder_domain, "audio_format=%s, seekable=%s",
audio_format_to_string(dc.in_audio_format, &af_string),
......
......@@ -142,7 +142,7 @@ struct DecoderControl {
*/
SongTime end_time;
float total_time;
SignedSongTime total_time;
/** the #MusicChunk allocator */
MusicBuffer *buffer;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment