summaryrefslogtreecommitdiff
path: root/src/lib/sndfile_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-01-03 00:47:32 +0000
committerCarl Hetherington <cth@carlh.net>2014-01-03 00:47:32 +0000
commit821b556975c44bcb2c8607fc26462b7b79db2fe6 (patch)
tree14a2ce9227c8ab385ee2b86cc57e54ab08a9a8cd /src/lib/sndfile_decoder.cc
parent3dfdd5795cf6514e15fdbece54c28f3bddc2aadc (diff)
Various fix-ups.
Diffstat (limited to 'src/lib/sndfile_decoder.cc')
-rw-r--r--src/lib/sndfile_decoder.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index 5e3f3313b..1c651e614 100644
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -45,7 +45,6 @@ SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<const Sndfi
throw DecodeError (_("could not open audio file for reading"));
}
- _done = 0;
_remaining = _info.frames;
}
@@ -94,8 +93,7 @@ SndfileDecoder::pass ()
}
data->set_frames (this_time);
- audio (data, _done * TIME_HZ / audio_frame_rate ());
- _done += this_time;
+ audio (data);
_remaining -= this_time;
return _remaining == 0;
@@ -123,7 +121,7 @@ void
SndfileDecoder::seek (ContentTime t, bool accurate)
{
Decoder::seek (t, accurate);
+ AudioDecoder::seek (t, accurate);
- _done = t * audio_frame_rate() / TIME_HZ;
_remaining = _info.frames - _done;
}