Various time-related fixes; fix daft hang on decodes.

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

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 24e2796aeac07badddd987d97074a7c8faf037c5..94845ec23ecde4938e2d6aeaf4499cb5b98c06d7 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -21,11 +21,14 @@
  *  @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 "decoder.h"
+extern "C" {
+#include <libswresample/swresample.h>
+}
 
 class AudioContent;
 
@@ -35,7 +38,15 @@ class AudioContent;
 class AudioDecoder : public AudioSource, public virtual Decoder
 {
 public:
-       AudioDecoder (boost::shared_ptr<const Film>);
+       AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const AudioContent>);
+       ~AudioDecoder ();
+
+       void emit_audio (boost::shared_ptr<const AudioBuffers>, Time);
+
+private:
+       boost::shared_ptr<const AudioContent> _audio_content;
+       SwrContext* _swr_context;
+       int _output_audio_frame_rate;
 };
 
 #endif