summaryrefslogtreecommitdiff
path: root/src/lib/sndfile_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-11 14:33:21 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-11 14:33:21 +0100
commitbba1bd9b08eb78bda8cdf7fa1393f3eeb2a504d9 (patch)
tree15255c28d58dd13f34d14068ce990ab7cf388249 /src/lib/sndfile_decoder.cc
parentf72dc5859fc91e09e85ad16138601fbec7922fb8 (diff)
Missing initialisation of _info.format; fix audio emission into frames rather than Time.
Diffstat (limited to 'src/lib/sndfile_decoder.cc')
-rw-r--r--src/lib/sndfile_decoder.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index b2ad45125..8374abbe9 100644
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -39,6 +39,7 @@ SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<const Sndfi
, _sndfile_content (c)
, _deinterleave_buffer (0)
{
+ _info.format = 0;
_sndfile = sf_open (_sndfile_content->file().string().c_str(), SFM_READ, &_info);
if (!_sndfile) {
throw DecodeError (_("could not open audio file for reading"));
@@ -89,7 +90,7 @@ SndfileDecoder::pass ()
}
data->set_frames (this_time);
- audio (data, double(_done) / audio_frame_rate());
+ audio (data, _done);
_done += this_time;
_remaining -= this_time;
}