2.0. audio: Audio pipeline is now in 32 bit.

[casparcg] / core / mixer / audio / audio_mixer.h

diff --git a/core/mixer/audio/audio_mixer.h b/core/mixer/audio/audio_mixer.h
index a94715bf5f25da4f1b6e1f75f73b7f4e5f8233fb..3a5648230c93d15a4de7c03c34a8043fa3bb8914 100644 (file)
--- a/core/mixer/audio/audio_mixer.h
+++ b/core/mixer/audio/audio_mixer.h
@@ -19,28 +19,33 @@
 */\r
 #pragma once\r
 \r
+#include <common/memory/safe_ptr.h>\r
+\r
 #include <core/producer/frame/frame_visitor.h>\r
-#include <core/producer/frame/audio_transform.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r
+#include <vector>\r
+\r
 namespace caspar { namespace core {\r
+\r
+struct video_format_desc;\r
        \r
 class audio_mixer : public core::frame_visitor, boost::noncopyable\r
 {\r
 public:\r
-       audio_mixer();\r
+       audio_mixer(const core::video_format_desc& format_desc);\r
 \r
-       virtual void begin(const core::basic_frame& frame);\r
+       virtual void begin(core::basic_frame& frame);\r
        virtual void visit(core::write_frame& frame);\r
        virtual void end();\r
 \r
-       std::vector<int16_t> mix();\r
+       std::vector<int32_t> mix();\r
        \r
        audio_mixer& operator=(audio_mixer&& other);\r
 private:\r
        struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
+       safe_ptr<implementation> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file