X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.h;h=d81a1c7c804eaef70e0444bc19c06c86c16ebcb1;hb=bcc4e2f7dc4cd5658e199ddacb7202b00ec72cf1;hp=69655cceb32b8d654db6d3cd33f143d5d1817a65;hpb=2537a2d959a5872c2e75b322022a7679d24c7e60;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 69655cceb..d81a1c7c8 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);
+	boost::optional<dcpomatic::ContentTime> position (boost::shared_ptr<const Film> film) const;
+	void emit (boost::shared_ptr<const Film> film, AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, dcpomatic::ContentTime);
 	void seek ();
 	void flush ();
 
-	ContentTime stream_position (AudioStreamPtr stream) const;
+	dcpomatic::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;
@@ -60,9 +61,13 @@ private:
 	void silence (int milliseconds);
 
 	boost::shared_ptr<const AudioContent> _content;
-	/** Frame after the last one that was emitted from Data for each AudioStream */
-	std::map<AudioStreamPtr, Frame> _positions;
-	std::map<AudioStreamPtr, boost::shared_ptr<Resampler> > _resamplers;
+	/** Frame after the last one that was emitted from Data (i.e. at the resampled rate, if applicable)
+	 *  for each AudioStream.
+	 */
+	typedef std::map<AudioStreamPtr, Frame> PositionMap;
+	PositionMap _positions;
+	typedef std::map<AudioStreamPtr, boost::shared_ptr<Resampler> > ResamplerMap;
+	ResamplerMap _resamplers;
 
 	bool _fast;
 };