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 2fe347cf2a50af794fbd261ad9587d31ed35b574..1f5868583675314df9158517d6159c2c13bce7ef 100644 (file)
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -21,6 +21,7 @@
 #include "audio_buffers.h"
 #include "exceptions.h"
 #include "log.h"
+#include "resampler.h"
 
 #include "i18n.h"
 
@@ -31,21 +32,16 @@ using std::cout;
 using boost::optional;
 using boost::shared_ptr;
 
-AudioDecoder::AudioDecoder (shared_ptr<const Film> f, shared_ptr<const AudioContent> c)
-       : Decoder (f)
+AudioDecoder::AudioDecoder (shared_ptr<const Film> film)
+       : Decoder (film)
        , _audio_position (0)
 {
-       _delay_frames = c->audio_delay() * c->content_audio_frame_rate() * f->dcp_audio_frame_rate() / (c->output_audio_frame_rate() * 1000);
+
 }
 
 void
 AudioDecoder::audio (shared_ptr<const AudioBuffers> data, AudioContent::Frame frame)
 {
-       frame += _delay_frames;
-       
        Audio (data, frame);
        _audio_position = frame + data->frames ();
-       if (_audio_position < 0) {
-               _audio_position = 0;
-       }
 }