Added support for more than 2 audio channels

[casparcg] / core / mixer / write_frame.h

diff --git a/core/mixer/write_frame.h b/core/mixer/write_frame.h
index 7c75d021daeff90f9272e3ac6297eb496eb8b9e8..08fbb6cd3cf964a098aac7358f554404af1089ee 100644 (file)
--- a/core/mixer/write_frame.h
+++ b/core/mixer/write_frame.h
@@ -26,6 +26,7 @@
 #include <core/producer/frame/basic_frame.h>\r
 #include <core/video_format.h>\r
 #include <core/mixer/audio/audio_mixer.h>\r
+#include <core/mixer/audio/audio_util.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 #include <boost/range/iterator_range.hpp>\r
@@ -43,8 +44,8 @@ class ogl_device;
 class write_frame : public core::basic_frame, boost::noncopyable\r
 {\r
 public:        \r
-       explicit write_frame(const void* tag);\r
-       explicit write_frame(const safe_ptr<ogl_device>& ogl, const void* tag, const core::pixel_format_desc& desc);\r
+       explicit write_frame(const void* tag, const channel_layout& channel_layout);\r
+       explicit write_frame(const safe_ptr<ogl_device>& ogl, const void* tag, const core::pixel_format_desc& desc, const channel_layout& channel_layout);\r
 \r
        write_frame(const write_frame& other);\r
        write_frame(write_frame&& other);\r
@@ -72,6 +73,8 @@ public:
        const void* tag() const;\r
 \r
        const core::pixel_format_desc& get_pixel_format_desc() const;\r
+       const channel_layout& get_channel_layout() const;\r
+       multichannel_view<int32_t, audio_buffer::iterator> get_multichannel_view();\r
        \r
 private:\r
        friend class image_mixer;\r