Merge master; specify libdcp-1.0.

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

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index a295df0ccbbf9d770b7f60afb0926ec99c56f659..bb3aafccd6a8982824f890fa05907ea8def66b96 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -44,6 +44,8 @@ public:
                return _audio_content;
        }
 
+       void seek (ContentTime time, bool accurate);
+       
 protected:
 
        void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
@@ -51,8 +53,7 @@ protected:
 
        boost::shared_ptr<const AudioContent> _audio_content;
        boost::shared_ptr<Resampler> _resampler;
-       /* End time of last audio that we wrote to _pending; only used for flushing the resampler */
-       ContentTime _last_audio;
+       boost::optional<AudioFrame> _audio_position;
 };
 
 #endif