Basics of splitting up Decoder tree like Content.

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

diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index 49633dd1fad2e503b345bf078fa4c56e454b52c1..7762ab1e4c037b9b8d49c33213fc9ed05ebca5d3 100644 (file)
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 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
@@ -19,6 +19,7 @@
 
 #include <iostream>
 #include <sndfile.h>
+#include "audio_content.h"
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
 #include "exceptions.h"
@@ -32,14 +33,13 @@ using std::min;
 using std::cout;
 using boost::shared_ptr;
 
-SndfileDecoder::SndfileDecoder (shared_ptr<const SndfileContent> c, bool fast)
+SndfileDecoder::SndfileDecoder (shared_ptr<const SndfileContent> c, bool fast, shared_ptr<Log> log)
        : Sndfile (c)
-       , AudioDecoder (c, fast)
        , _done (0)
        , _remaining (_info.frames)
        , _deinterleave_buffer (0)
 {
-
+       audio.reset (new AudioDecoder (this, c->audio, fast, log));
 }
 
 SndfileDecoder::~SndfileDecoder ()
@@ -48,7 +48,7 @@ SndfileDecoder::~SndfileDecoder ()
 }
 
 bool
-SndfileDecoder::pass ()
+SndfileDecoder::pass (PassReason, bool)
 {
        if (_remaining == 0) {
                return true;
@@ -57,14 +57,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->audio_stream()->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_stream()->channels ();
+       int const channels = _sndfile_content->audio->stream()->channels ();
 
        shared_ptr<AudioBuffers> data (new AudioBuffers (channels, this_time));
 
-       if (_sndfile_content->audio_stream()->channels() == 1) {
+       if (_sndfile_content->audio->stream()->channels() == 1) {
                /* No de-interleaving required */
                sf_read_float (_sndfile, data->data(0), this_time);
        } else {
@@ -86,7 +86,7 @@ SndfileDecoder::pass ()
        }
 
        data->set_frames (this_time);
-       audio (_sndfile_content->audio_stream (), data, ContentTime::from_frames (_done, _info.samplerate));
+       audio->audio (_sndfile_content->audio->stream (), data, ContentTime::from_frames (_done, _info.samplerate));
        _done += this_time;
        _remaining -= this_time;
 
@@ -96,7 +96,7 @@ SndfileDecoder::pass ()
 void
 SndfileDecoder::seek (ContentTime t, bool accurate)
 {
-       AudioDecoder::seek (t, accurate);
+       audio->seek (t, accurate);
 
        _done = t.frames_round (_info.samplerate);
        _remaining = _info.frames - _done;