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

decoder/Client: use std::chrono::duration<double> instead of raw double

Browse Source
This commit is contained in:
Max Kellermann
2018-09-21 19:37:56 +02:00
parent d1bcd98f79
commit 90f4e97751
10 changed files with 21 additions and 20 deletions

16
src/decoder/Bridge.cxx

@@ -290,7 +290,7 @@ DecoderBridge::CommandFinished()
assert(dc.pipe->IsEmpty());
initial_seek_running = false;
timestamp = dc.start_time.ToDoubleS();
timestamp = std::chrono::duration_cast<FloatDuration>(dc.start_time);
absolute_frame = dc.start_time.ToScale<uint64_t>(dc.in_audio_format.sample_rate);
return;
}
@@ -307,7 +307,7 @@ DecoderBridge::CommandFinished()
if (convert != nullptr)
convert->Reset();
timestamp = dc.seek_time.ToDoubleS();
timestamp = std::chrono::duration_cast<FloatDuration>(dc.seek_time);
absolute_frame = dc.seek_time.ToScale<uint64_t>(dc.in_audio_format.sample_rate);
}
@@ -413,12 +413,12 @@ try {
}
void
DecoderBridge::SubmitTimestamp(double t)
DecoderBridge::SubmitTimestamp(FloatDuration t)
{
assert(t >= 0);
assert(t.count() >= 0);
timestamp = t;
absolute_frame = uint64_t(t * dc.in_audio_format.sample_rate);
absolute_frame = uint64_t(t.count() * dc.in_audio_format.sample_rate);
}
DecoderCommand
@@ -506,7 +506,7 @@ DecoderBridge::SubmitData(InputStream *is,
const auto dest =
chunk->Write(dc.out_audio_format,
SongTime::FromS(timestamp) -
SongTime::Cast(timestamp) -
dc.song->GetStartTime(),
kbit_rate);
if (dest.empty()) {
@@ -532,8 +532,8 @@ DecoderBridge::SubmitData(InputStream *is,
data = (const uint8_t *)data + nbytes;
length -= nbytes;
timestamp += (double)nbytes /
dc.out_audio_format.GetTimeToSize();
timestamp += FloatDuration((double)nbytes /
dc.out_audio_format.GetTimeToSize());
}
absolute_frame += data_frames;