X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Faudio_decoder.h;h=754321880bcb026c7af361f6ff642eea350ea3f0;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hp=4b7594f352719a32124684aca0e77b77c7973507;hpb=f113b2aaca7a65f7b37e12a7d9f3f99e2d834e81;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 4b7594f35..754321880 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,49 +18,62 @@
 
 */
 
+
 /** @file src/lib/audio_decoder.h
  *  @brief Parent class for audio decoders.
  */
 
+
 #ifndef DCPOMATIC_AUDIO_DECODER_H
 #define DCPOMATIC_AUDIO_DECODER_H
 
+
 #include "decoder.h"
 #include "content_audio.h"
 #include "audio_stream.h"
 #include "decoder_part.h"
-#include <boost/enable_shared_from_this.hpp>
+#include <boost/signals2.hpp>
+
 
 class AudioBuffers;
 class AudioContent;
 class AudioDecoderStream;
 class Log;
+class Film;
+class Resampler;
+
 
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
  */
-class AudioDecoder : public boost::enable_shared_from_this<AudioDecoder>, public DecoderPart
+class AudioDecoder : public std::enable_shared_from_this<AudioDecoder>, public DecoderPart
 {
 public:
-	AudioDecoder (Decoder* parent, boost::shared_ptr<const AudioContent>, boost::shared_ptr<Log> log);
+	AudioDecoder (Decoder* parent, std::shared_ptr<const AudioContent> content, bool fast);
 
-	/** Try to fetch some audio from a specific place in this content.
-	 *  @param frame Frame to start from (after resampling, if applicable)
-	 *  @param length Frames to get (after resampling, if applicable)
-	 *  @param accurate true to try hard to return frames from exactly `frame', false if we don't mind nearby frames.
-	 *  @return Time-stamped audio data which may or may not be from the location (and of the length) requested.
-	 */
-	ContentAudio get (AudioStreamPtr stream, Frame time, Frame length, bool accurate);
+	boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film> film) const;
+	void emit (std::shared_ptr<const Film> film, AudioStreamPtr stream, std::shared_ptr<const AudioBuffers>, dcpomatic::ContentTime, bool time_already_delayed = false);
+	void seek ();
+	void flush ();
 
-	void set_fast ();
+	dcpomatic::ContentTime stream_position (std::shared_ptr<const Film> film, AudioStreamPtr stream) const;
 
-	void give (AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
-	void flush ();
-	void seek (ContentTime t, bool accurate);
+	boost::signals2::signal<void (AudioStreamPtr, ContentAudio)> Data;
 
 private:
-	/** An AudioDecoderStream object to manage each stream in _audio_content */
-	std::map<AudioStreamPtr, boost::shared_ptr<AudioDecoderStream> > _streams;
+	void silence (int milliseconds);
+
+	std::shared_ptr<const AudioContent> _content;
+	/** 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, std::shared_ptr<Resampler>> ResamplerMap;
+	ResamplerMap _resamplers;
+
+	bool _fast;
 };
 
+
 #endif