Merge branch 'master' into fix-early-audio-take2

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

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 1570fe3b00ea3318587d9f7c70d097c2032455cf..cfe94b5283dc48c06a83e516b526c789dae46861 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -31,10 +31,10 @@
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
  */
-class AudioDecoder : public AudioSource, public virtual Decoder
+class AudioDecoder : public TimedAudioSource, public virtual Decoder
 {
 public:
-       AudioDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
+       AudioDecoder (boost::shared_ptr<Film>, DecodeOptions);
 
        virtual void set_audio_stream (boost::shared_ptr<AudioStream>);