Merge master.

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

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 12f8505f64814244f4a5d1a0cba530df3e648f22..5b68a51a17534d8f07f719927927bf022699f35b 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -48,13 +48,12 @@ public:
        
 protected:
 
-       virtual ContentTime first_audio () const = 0;
-       void audio (boost::shared_ptr<const AudioBuffers>);
+       void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
        void flush ();
 
        boost::shared_ptr<const AudioContent> _audio_content;
        boost::shared_ptr<Resampler> _resampler;
-       AudioFrame _audio_position;
+       boost::optional<ContentTime> _audio_position;
 };
 
 #endif