Rename some methods.

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

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 0b0d306f647469fd4d09654338e5fd932cdd8c3e..1a52b859101561e13288bb9f4263baf77787478d 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,45 +25,46 @@
 #define DCPOMATIC_AUDIO_DECODER_H
 
 #include "decoder.h"
-#include "content.h"
-#include "audio_content.h"
 #include "content_audio.h"
+#include "audio_stream.h"
+#include <boost/enable_shared_from_this.hpp>
 
 class AudioBuffers;
-class Resampler;
+class AudioContent;
+class AudioDecoderStream;
+class Log;
 
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
  */
-class AudioDecoder : public virtual Decoder
+class AudioDecoder : public boost::enable_shared_from_this<AudioDecoder>
 {
 public:
-       AudioDecoder (boost::shared_ptr<const AudioContent>);
-       
-       boost::shared_ptr<const AudioContent> audio_content () const {
-               return _audio_content;
-       }
+       AudioDecoder (Decoder* parent, boost::shared_ptr<const AudioContent>, bool fast, boost::shared_ptr<Log> log);
 
        /** Try to fetch some audio from a specific place in this content.
-        *  @param frame Frame to start from.
-        *  @param length Frames to get.
+        *  @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.
         */
-       boost::shared_ptr<ContentAudio> get_audio (AudioFrame time, AudioFrame length, bool accurate);
-       
-protected:
+       ContentAudio get (AudioStreamPtr stream, Frame time, Frame length, bool accurate);
+
+       void set_ignore ();
+
+       bool fast () const {
+               return _fast;
+       }
 
-       void seek (ContentTime time, bool accurate);
-       void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
+       void give (AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
        void flush ();
-       void reset_decoded_audio ();
+       void seek (ContentTime t, bool accurate);
 
-       boost::shared_ptr<const AudioContent> _audio_content;
-       boost::shared_ptr<Resampler> _resampler;
-       boost::optional<AudioFrame> _audio_position;
-       /** Currently-available decoded audio data */
-       ContentAudio _decoded_audio;
+private:
+       /** An AudioDecoderStream object to manage each stream in _audio_content */
+       std::map<AudioStreamPtr, boost::shared_ptr<AudioDecoderStream> > _streams;
+       bool _ignore;
+       bool _fast;
 };
 
 #endif