2.0. audio:

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

diff --git a/core/mixer/audio/audio_mixer.h b/core/mixer/audio/audio_mixer.h
index 7801e7b0acd7d65549fb47ca226251e0c33bc05d..6523ef253992f9c848474b6d86c32544dd9536ed 100644 (file)
--- a/core/mixer/audio/audio_mixer.h
+++ b/core/mixer/audio/audio_mixer.h
@@ -1,31 +1,55 @@
+/*\r
+* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+*\r
+*  This file is part of CasparCG.\r
+*\r
+*    CasparCG is free software: you can redistribute it and/or modify\r
+*    it under the terms of the GNU General Public License as published by\r
+*    the Free Software Foundation, either version 3 of the License, or\r
+*    (at your option) any later version.\r
+*\r
+*    CasparCG is distributed in the hope that it will be useful,\r
+*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+*    GNU General Public License for more details.\r
+\r
+*    You should have received a copy of the GNU General Public License\r
+*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
+*\r
+*/\r
 #pragma once\r
 \r
-namespace caspar { namespace core {\r
+#include <common/memory/safe_ptr.h>\r
 \r
-struct audio_transform\r
-{\r
-       audio_transform() : gain(1.0){}\r
-       double gain;\r
+#include <core/producer/frame/frame_visitor.h>\r
 \r
-       audio_transform& operator*=(const audio_transform &other);\r
-       const audio_transform operator*(const audio_transform &other) const;\r
-};\r
+#include <boost/noncopyable.hpp>\r
+\r
+#include <tbb/cache_aligned_allocator.h>\r
+\r
+#include <vector>\r
 \r
-class audio_mixer\r
+namespace caspar { namespace core {\r
+\r
+struct video_format_desc;\r
+       \r
+typedef std::vector<int32_t, tbb::cache_aligned_allocator<int32_t>> audio_buffer;\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
-       void begin(const audio_transform& transform);\r
-       void process(const std::vector<short>& audio_data);\r
-       void end();\r
-       \r
-       std::vector<short> begin_pass();\r
-       void end_pass();\r
+       virtual void begin(core::basic_frame& frame);\r
+       virtual void visit(core::write_frame& frame);\r
+       virtual void end();\r
 \r
+       audio_buffer 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