aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder/DecoderAPI.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'src/decoder/DecoderAPI.cxx')
-rw-r--r--src/decoder/DecoderAPI.cxx24
1 files changed, 4 insertions, 20 deletions
diff --git a/src/decoder/DecoderAPI.cxx b/src/decoder/DecoderAPI.cxx
index 7349b00db..c9bdb46e8 100644
--- a/src/decoder/DecoderAPI.cxx
+++ b/src/decoder/DecoderAPI.cxx
@@ -204,37 +204,21 @@ decoder_command_finished(Decoder &decoder)
dc.Unlock();
}
-double decoder_seek_where(gcc_unused Decoder & decoder)
+SongTime
+decoder_seek_time(Decoder &decoder)
{
const DecoderControl &dc = decoder.dc;
assert(dc.pipe != nullptr);
if (decoder.initial_seek_running)
- return dc.start_ms / 1000.;
+ return SongTime(dc.start_ms);
assert(dc.command == DecoderCommand::SEEK);
decoder.seeking = true;
- return dc.seek_where;
-}
-
-unsigned
-decoder_seek_where_ms(Decoder &decoder)
-{
- const DecoderControl &dc = decoder.dc;
-
- assert(dc.pipe != nullptr);
-
- if (decoder.initial_seek_running)
- return dc.start_ms;
-
- assert(dc.command == DecoderCommand::SEEK);
-
- decoder.seeking = true;
-
- return unsigned(dc.seek_where * 1000);
+ return SongTime::FromS(dc.seek_where);
}
uint64_t