No-op: remove all trailing whitespace.

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

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index a295df0ccbbf9d770b7f60afb0926ec99c56f659..387b1ad7ff74e396a6e85978ec6731a8c3af60d9 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 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
@@ -27,32 +27,41 @@
 #include "decoder.h"
 #include "content.h"
 #include "audio_content.h"
-#include "decoded.h"
+#include "content_audio.h"
+#include <boost/enable_shared_from_this.hpp>
 
 class AudioBuffers;
-class Resampler;
+class AudioDecoderStream;
 
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
  */
-class AudioDecoder : public virtual Decoder
+class AudioDecoder : public virtual Decoder, public boost::enable_shared_from_this<AudioDecoder>
 {
 public:
-       AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const AudioContent>);
-       
+       AudioDecoder (boost::shared_ptr<const AudioContent>);
+
        boost::shared_ptr<const AudioContent> audio_content () const {
                return _audio_content;
        }
 
-protected:
+       /** 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_audio (AudioStreamPtr stream, Frame time, Frame length, bool accurate);
 
-       void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
+protected:
+       void audio (AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
        void flush ();
+       void seek (ContentTime t, bool accurate);
 
+private:
        boost::shared_ptr<const AudioContent> _audio_content;
-       boost::shared_ptr<Resampler> _resampler;
-       /* End time of last audio that we wrote to _pending; only used for flushing the resampler */
-       ContentTime _last_audio;
+       /** An AudioDecoderStream object to manage each stream in _audio_content */
+       std::map<AudioStreamPtr, boost::shared_ptr<AudioDecoderStream> > _streams;
 };
 
 #endif