Merge 1.0 in.

[dcpomatic.git] / src / lib / audio_decoder.cc

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index df13a984a4b36416fb1120b6512aca4537484f6c..1f5868583675314df9158517d6159c2c13bce7ef 100644 (file)
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -18,12 +18,30 @@
 */
 
 #include "audio_decoder.h"
+#include "audio_buffers.h"
+#include "exceptions.h"
+#include "log.h"
+#include "resampler.h"
 
+#include "i18n.h"
+
+using std::stringstream;
+using std::list;
+using std::pair;
+using std::cout;
 using boost::optional;
 using boost::shared_ptr;
 
-AudioDecoder::AudioDecoder (shared_ptr<const Film> f)
-       : Decoder (f)
+AudioDecoder::AudioDecoder (shared_ptr<const Film> film)
+       : Decoder (film)
+       , _audio_position (0)
 {
 
 }
+
+void
+AudioDecoder::audio (shared_ptr<const AudioBuffers> data, AudioContent::Frame frame)
+{
+       Audio (data, frame);
+       _audio_position = frame + data->frames ();
+}