X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.h;h=50e361e8f19f80cb181bc8a55d3e80f1aa73da8c;hb=debf377abe77a8d3ac0880932d36c048138d9b3f;hp=d422503a78b4a643afee95493ff2c3a6a09ec85d;hpb=a8855402f9bc9815b10405ff68c313f4a4584651;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index d422503a7..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;
@@ -63,8 +64,10 @@ private:
 	/** Frame after the last one that was emitted from Data (i.e. at the resampled rate, if applicable)
 	 *  for each AudioStream.
 	 */
-	std::map<AudioStreamPtr, Frame> _positions;
-	std::map<AudioStreamPtr, boost::shared_ptr<Resampler> > _resamplers;
+	typedef std::map<AudioStreamPtr, Frame> PositionMap;
+	PositionMap _positions;
+	typedef std::map<AudioStreamPtr, boost::shared_ptr<Resampler> > ResamplerMap;
+	ResamplerMap _resamplers;
 
 	bool _fast;
 };