From 254b3044d72de6b033d7c584f5abd2b9aa70aad5 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 21 Nov 2018 01:59:04 +0000
Subject: Take Film pointer out of Content.

---
 src/lib/audio_decoder.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/lib/audio_decoder.h')

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 8765be426..50e361e8f 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -36,6 +36,7 @@ class AudioBuffers;
 class AudioContent;
 class AudioDecoderStream;
 class Log;
+class Film;
 class Resampler;
 
 /** @class AudioDecoder.
@@ -44,14 +45,14 @@ class Resampler;
 class AudioDecoder : public boost::enable_shared_from_this<AudioDecoder>, public DecoderPart
 {
 public:
-	AudioDecoder (Decoder* parent, boost::shared_ptr<const AudioContent> content, boost::shared_ptr<Log> log, bool fast);
+	AudioDecoder (Decoder* parent, boost::shared_ptr<const AudioContent> content, bool fast);
 
-	ContentTime position () const;
-	void emit (AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
+	ContentTime position (boost::shared_ptr<const Film> film) const;
+	void emit (boost::shared_ptr<const Film> film, AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
 	void seek ();
 	void flush ();
 
-	ContentTime stream_position (AudioStreamPtr stream) const;
+	ContentTime stream_position (boost::shared_ptr<const Film> film, AudioStreamPtr stream) const;
 
 	/** @return Number of frames of data that were accepted */
 	boost::signals2::signal<void (AudioStreamPtr, ContentAudio)> Data;
-- 
cgit v1.2.3