Fix write_frame_info again.

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

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index cfe94b5283dc48c06a83e516b526c789dae46861..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
@@ -21,38 +21,47 @@
  *  @brief Parent class for audio decoders.
  */
 
-#ifndef DVDOMATIC_AUDIO_DECODER_H
-#define DVDOMATIC_AUDIO_DECODER_H
+#ifndef DCPOMATIC_AUDIO_DECODER_H
+#define DCPOMATIC_AUDIO_DECODER_H
 
-#include "audio_source.h"
-#include "stream.h"
 #include "decoder.h"
+#include "content.h"
+#include "audio_content.h"
+#include "content_audio.h"
+#include <boost/enable_shared_from_this.hpp>
+
+class AudioBuffers;
+class AudioDecoderStream;
 
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
  */
-class AudioDecoder : public TimedAudioSource, public virtual Decoder
+class AudioDecoder : public virtual Decoder, public boost::enable_shared_from_this<AudioDecoder>
 {
 public:
-       AudioDecoder (boost::shared_ptr<Film>, DecodeOptions);
-
-       virtual void set_audio_stream (boost::shared_ptr<AudioStream>);
+       AudioDecoder (boost::shared_ptr<const AudioContent>);
 
-       /** @return Audio stream that we are using */
-       boost::shared_ptr<AudioStream> audio_stream () const {
-               return _audio_stream;
+       boost::shared_ptr<const AudioContent> audio_content () const {
+               return _audio_content;
        }
 
-       /** @return All available audio streams */
-       std::vector<boost::shared_ptr<AudioStream> > audio_streams () const {
-               return _audio_streams;
-       }
+       /** 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);
 
 protected:
-       /** Audio stream that we are using */
-       boost::shared_ptr<AudioStream> _audio_stream;
-       /** All available audio streams */
-       std::vector<boost::shared_ptr<AudioStream> > _audio_streams;
+       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;
+       /** An AudioDecoderStream object to manage each stream in _audio_content */
+       std::map<AudioStreamPtr, boost::shared_ptr<AudioDecoderStream> > _streams;
 };
 
 #endif