Merge master.

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

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index bb3aafccd6a8982824f890fa05907ea8def66b96..35d9f3560b7d55565ddc3eb8cf9b17e1bebe4ac7 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -38,7 +38,7 @@ class Resampler;
 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;
@@ -53,7 +53,7 @@ protected:
 
        boost::shared_ptr<const AudioContent> _audio_content;
        boost::shared_ptr<Resampler> _resampler;
-       boost::optional<AudioFrame> _audio_position;
+       boost::optional<ContentTime> _audio_position;
 };
 
 #endif