X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.h;h=716b37969d87986d5ebf449ea98a4a68900f5849;hb=765f90586c498860aa687e2b0cd6cedf1e0b1bf0;hp=9bef8e0e7cf579f9903a3abed1dd7b684d739860;hpb=422341d1cb6bc8cbb6be76eac239c40cb4061c79;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 9bef8e0e7..716b37969 100644
--- 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,55 @@
  *  @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_audio.h"
+#include "audio_stream.h"
+#include <boost/enable_shared_from_this.hpp>
+
+class AudioBuffers;
+class AudioContent;
+class AudioDecoderStream;
 
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
  */
-class AudioDecoder : public AudioSource, 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>, bool fast);
 
-	/** @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);
+
+	void set_ignore_audio ();
+
+	bool fast () const {
+		return _fast;
 	}
 
 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;
+	bool _ignore_audio;
+	bool _fast;
 };
 
 #endif