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 e827a77b9198f44addfabd827e030fc260121bf5..1f5868583675314df9158517d6159c2c13bce7ef 100644 (file)
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -32,36 +32,16 @@ using std::cout;
 using boost::optional;
 using boost::shared_ptr;
 
-AudioDecoder::AudioDecoder (shared_ptr<const Film> film, shared_ptr<const AudioContent> content)
+AudioDecoder::AudioDecoder (shared_ptr<const Film> film)
        : Decoder (film)
        , _audio_position (0)
 {
-       if (content->content_audio_frame_rate() != content->output_audio_frame_rate()) {
-               _resampler.reset (
-                       new Resampler (
-                               content->content_audio_frame_rate(),
-                               content->output_audio_frame_rate(),
-                               content->audio_channels()
-                               )
-                       );
-       }
+
 }
 
 void
 AudioDecoder::audio (shared_ptr<const AudioBuffers> data, AudioContent::Frame frame)
 {
-       if (_resampler) {
-               data = _resampler->run (data);
-       } 
-
-       Audio (data, _audio_position);
+       Audio (data, frame);
        _audio_position = frame + data->frames ();
 }
-
-void
-AudioDecoder::flush ()
-{
-       if (_resampler) {
-               _resampler->flush ();
-       }
-}