Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0

1 files changed, 6 insertions, 1 deletions

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index d5e7c6f55..716b37969 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -39,7 +39,7 @@ class AudioDecoderStream;
 class AudioDecoder : public virtual Decoder, public boost::enable_shared_from_this<AudioDecoder>
 {
 public:
-	AudioDecoder (boost::shared_ptr<const AudioContent>);
+	AudioDecoder (boost::shared_ptr<const AudioContent>, bool fast);
 
 	boost::shared_ptr<const AudioContent> audio_content () const {
 		return _audio_content;
@@ -55,6 +55,10 @@ public:
 
 	void set_ignore_audio ();
 
+	bool fast () const {
+		return _fast;
+	}
+
 protected:
 	void audio (AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
 	void flush ();
@@ -65,6 +69,7 @@ private:
 	/** An AudioDecoderStream object to manage each stream in _audio_content */
 	std::map<AudioStreamPtr, boost::shared_ptr<AudioDecoderStream> > _streams;
 	bool _ignore_audio;
+	bool _fast;
 };
 
 #endif