ffmpeg_producer: Multiple audio streams are now merged (flattened) before the audio...

[casparcg] / modules / ffmpeg / producer / audio / audio_decoder.h

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.h b/modules/ffmpeg/producer/audio/audio_decoder.h
index 177e104859b64cfe9172f6878f29756b10a3bae8..99f6e398be358d3342bb7c44b94b1761b28314fd 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.h
+++ b/modules/ffmpeg/producer/audio/audio_decoder.h
@@ -26,25 +26,19 @@
 
 #include <common/memory.h>
 
+#include <core/fwd.h>
+
 #include <boost/noncopyable.hpp>
 
 struct AVPacket;
 struct AVFormatContext;
 
-namespace caspar { 
-                       
-namespace core {
-
-struct video_format_desc;
-
-}
-
-namespace ffmpeg {
+namespace caspar { namespace ffmpeg {
        
 class audio_decoder : public boost::noncopyable
 {
 public:
-       explicit audio_decoder(class input& input, const core::video_format_desc& format_desc);
+       explicit audio_decoder(class input& input, const core::video_format_desc& format_desc, int audio_stream_index);
        
        audio_decoder(audio_decoder&& other);
        audio_decoder& operator=(audio_decoder&& other);
@@ -55,7 +49,7 @@ public:
        
        std::wstring print() const;
        
-       monitor::source& monitor_output();
+       core::monitor::subject& monitor_output();
 
 private:
        struct impl;