WIP: more

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

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index ff0db6e8fa8452e611e48669914028f2649d1feb..4cb2f17bf8d9c76d70ec16bc8b859e14a129a032 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -49,10 +49,10 @@ class Resampler;
 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 ();
 
@@ -64,15 +64,9 @@ 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;
 };