Merge master.

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

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 0b0d306f647469fd4d09654338e5fd932cdd8c3e..750ecd360aa67b705e5b54d730a222ef8fe15455 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -58,12 +58,18 @@ protected:
        void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
        void flush ();
        void reset_decoded_audio ();
+       void add (boost::shared_ptr<const AudioBuffers>);
 
        boost::shared_ptr<const AudioContent> _audio_content;
        boost::shared_ptr<Resampler> _resampler;
+       boost::shared_ptr<AudioProcessor> _processor;
        boost::optional<AudioFrame> _audio_position;
        /** Currently-available decoded audio data */
        ContentAudio _decoded_audio;
+       /** The time of an accurate seek after which we have not yet received any actual
+           data at the seek time.
+       */
+       boost::optional<ContentTime> _seek_reference;
 };
 
 #endif