{Video,Audio}Frame -> Frame.

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

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 045efc00207758d01cb56fce7996d685f1a1b458..99e9092b30619c02f394f12ad0ab32be47bcb3c0 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -45,12 +45,12 @@ 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.
         */
-       boost::shared_ptr<ContentAudio> get_audio (AudioFrame time, AudioFrame length, bool accurate);
+       boost::shared_ptr<ContentAudio> get_audio (Frame time, Frame length, bool accurate);
        
 protected:
 
@@ -58,11 +58,12 @@ 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;
+       boost::optional<Frame> _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