Attempts to simplify black-filling logic in Player.

[dcpomatic.git] / src / lib / audio_decoder.h

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index cdb643ceeabef373aa5ada3f705168beed574766..624b5c94ab01d3f9c3674a2b5d7f767d52eae012 100644 (file)
--- 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-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -30,11 +30,13 @@
 #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 Resampler;
 
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
@@ -42,28 +44,22 @@ class Log;
 class AudioDecoder : public boost::enable_shared_from_this<AudioDecoder>, public DecoderPart
 {
 public:
-       AudioDecoder (Decoder* parent, boost::shared_ptr<const AudioContent>, boost::shared_ptr<Log> log);
+       AudioDecoder (Decoder* parent, boost::shared_ptr<const AudioContent> content, boost::shared_ptr<Log> log);
 
-       /** 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);
-
-       void set_fast ();
-
-       void give (AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
+       ContentTime position () const;
+       void emit (AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
+       void seek ();
        void flush ();
-       void seek (ContentTime t, bool accurate);
 
-       boost::optional<ContentTime> position () const;
+       ContentTime stream_position (AudioStreamPtr stream) const;
+
+       boost::signals2::signal<void (AudioStreamPtr, ContentAudio)> Data;
 
 private:
-       /** An AudioDecoderStream object to manage each stream in _audio_content */
-       typedef std::map<AudioStreamPtr, boost::shared_ptr<AudioDecoderStream> > StreamMap;
-       StreamMap _streams;
+       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;
 };
 
 #endif