Missing initialisation of _info.format; fix audio emission into frames rather than...

diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index b2ad451259672a12c4906be42c4e5fdc431260fa..8374abbe9a0ec7a68c88a12baca5e38bbc29b4ee 100644 (file)
--- 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;
 }