WIP: more

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

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 2b6e3f75879889e4e7b713a8b119b3179d0bdb23..4cb2f17bf8d9c76d70ec16bc8b859e14a129a032 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -18,19 +18,23 @@
 
 */
 
+
 /** @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.h"
 #include "decoder_part.h"
+#include "piece_audio.h"
 #include <boost/signals2.hpp>
 
+
 class AudioBuffers;
 class AudioContent;
 class AudioDecoderStream;
@@ -38,36 +42,32 @@ class Log;
 class Film;
 class Resampler;
 
+
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
  */
 class AudioDecoder : public std::enable_shared_from_this<AudioDecoder>, public DecoderPart
 {
 public:
-       AudioDecoder (Decoder* parent, std::shared_ptr<const AudioContent> content, bool fast);
+       AudioDecoder (Decoder* parent, std::shared_ptr<const AudioContent> content);
 
        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 emit (AudioStreamPtr stream, std::shared_ptr<const AudioBuffers>, dcpomatic::ContentTime, bool time_already_delayed = false);
        void seek ();
        void flush ();
 
        dcpomatic::ContentTime stream_position (std::shared_ptr<const Film> film, AudioStreamPtr stream) const;
 
-       boost::signals2::signal<void (AudioStreamPtr, ContentAudio)> Data;
+       boost::signals2::signal<void (AudioStreamPtr, std::shared_ptr<const AudioBuffers>, Frame)> Data;
 
 private:
        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.
-        */
+       /** Frame after the last one that was emitted from Data 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