Merge master.

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

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index c83c356b7488c157dc85a6cd589dc7f256d029d5..f8438df524cdbdfabb4bcfe6ddc91145db5f60aa 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -45,8 +45,8 @@ public:
        }
 
        /** Try to fetch some audio from a specific place in this content.
-        *  @param frame Frame to start from.
-        *  @param length Frames to get.
+        *  @param frame Frame to start from (after resampling, if applicable)
+        *  @param length Frames to get (after resampling, if applicable)
         *  @param accurate true to try hard to return frames from exactly `frame', false if we don't mind nearby frames.
         *  @return Time-stamped audio data which may or may not be from the location (and of the length) requested.
         */
@@ -57,12 +57,19 @@ protected:
        void seek (ContentTime time, bool accurate);
        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