Merge master.

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

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 0cd0e9754c6c889fb77210b7109029ff50cfd1a7..35d9f3560b7d55565ddc3eb8cf9b17e1bebe4ac7 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -30,6 +30,7 @@
 #include "decoded.h"
 
 class AudioBuffers;
+class Resampler;
 
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
@@ -37,17 +38,22 @@ class AudioBuffers;
 class AudioDecoder : public virtual Decoder
 {
 public:
-       AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const AudioContent>);
-
+       AudioDecoder (boost::shared_ptr<const AudioContent>);
+       
        boost::shared_ptr<const AudioContent> audio_content () const {
                return _audio_content;
        }
 
+       void seek (ContentTime time, bool accurate);
+       
 protected:
 
        void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
-       
-       boost::shared_ptr<const AudioContent> _audio_content;   
+       void flush ();
+
+       boost::shared_ptr<const AudioContent> _audio_content;
+       boost::shared_ptr<Resampler> _resampler;
+       boost::optional<ContentTime> _audio_position;
 };
 
 #endif