X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fsndfile_decoder.cc;h=2c47fcd9e9ca9ddff3946590dc9008d3ff8d8815;hb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;hp=432f73f0d66f5b30e6c8068a13266719cf9c197b;hpb=e194f0003b60b2607da0822485c56cd8267e78dc;p=dcpomatic.git

diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index 432f73f0d..2c47fcd9e 100644
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,10 +18,13 @@
 */
 
 #include <iostream>
+#ifdef DCPOMATIC_WINDOWS
+#include <windows.h>
+#define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
+#endif
 #include <sndfile.h>
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
-#include "film.h"
 #include "exceptions.h"
 #include "audio_buffers.h"
 
@@ -33,30 +36,23 @@ using std::min;
 using std::cout;
 using boost::shared_ptr;
 
-SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<const SndfileContent> c)
-	: Decoder (f)
-	, AudioDecoder (f, c)
-	, _sndfile_content (c)
+SndfileDecoder::SndfileDecoder (shared_ptr<const SndfileContent> c)
+	: Sndfile (c)
+	, AudioDecoder (c)
+	, _done (0)
+	, _remaining (_info.frames)
 	, _deinterleave_buffer (0)
 {
-	_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"));
-	}
-
-	_done = 0;
-	_remaining = _info.frames;
+	
 }
 
 SndfileDecoder::~SndfileDecoder ()
 {
-	sf_close (_sndfile);
 	delete[] _deinterleave_buffer;
 }
 
 bool
-SndfileDecoder::pass ()
+SndfileDecoder::pass (PassReason)
 {
 	if (_remaining == 0) {
 		return true;
@@ -65,14 +61,14 @@ SndfileDecoder::pass ()
 	/* Do things in half second blocks as I think there may be limits
 	   to what FFmpeg (and in particular the resampler) can cope with.
 	*/
-	sf_count_t const block = _sndfile_content->content_audio_frame_rate() / 2;
+	sf_count_t const block = _sndfile_content->audio_stream()->frame_rate() / 2;
 	sf_count_t const this_time = min (block, _remaining);
 
-	int const channels = _sndfile_content->audio_channels ();
+	int const channels = _sndfile_content->audio_stream()->channels ();
 	
 	shared_ptr<AudioBuffers> data (new AudioBuffers (channels, this_time));
 
-	if (_sndfile_content->audio_channels() == 1) {
+	if (_sndfile_content->audio_stream()->channels() == 1) {
 		/* No de-interleaving required */
 		sf_read_float (_sndfile, data->data(0), this_time);
 	} else {
@@ -94,36 +90,18 @@ SndfileDecoder::pass ()
 	}
 		
 	data->set_frames (this_time);
-	audio (data, _done * TIME_HZ / audio_frame_rate ());
+	audio (_sndfile_content->audio_stream (), data, ContentTime::from_frames (_done, _info.samplerate));
 	_done += this_time;
 	_remaining -= this_time;
 
-	return true;
-}
-
-int
-SndfileDecoder::audio_channels () const
-{
-	return _info.channels;
-}
-
-AudioContent::Frame
-SndfileDecoder::audio_length () const
-{
-	return _info.frames;
-}
-
-int
-SndfileDecoder::audio_frame_rate () const
-{
-	return _info.samplerate;
+	return _remaining == 0;
 }
 
 void
 SndfileDecoder::seek (ContentTime t, bool accurate)
 {
-	Decoder::seek (t, accurate);
+	AudioDecoder::seek (t, accurate);
 
-	_done = t * audio_frame_rate() / TIME_HZ;
+	_done = t.frames (_info.samplerate);
 	_remaining = _info.frames - _done;
 }