X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_decoder.cc;h=e10f4f568430d08dd86d1d5db38d2116606fbbbb;hb=2d5b8cdde08044d323aa7193dfac6c9f8bca7131;hp=80a6afd2baf79eae384164a310119a127e21c5bf;hpb=89115db77729a2c99f1a09ff6a461720e16f889e;p=dcpomatic.git

diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index 80a6afd2b..e10f4f568 100644
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -35,11 +35,12 @@ using boost::shared_ptr;
 
 SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<const SndfileContent> c)
 	: Decoder (f)
-	, AudioDecoder (f)
+	, AudioDecoder (f, c)
 	, _sndfile_content (c)
 	, _deinterleave_buffer (0)
 {
-	_sndfile = sf_open (_sndfile_content->file().string().c_str(), SFM_READ, &_info);
+	_info.format = 0;
+	_sndfile = sf_open (_sndfile_content->path(0).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;
 }