2.0.2: - core: some cleanup.

[casparcg] / core / mixer / image / image_mixer.h

diff --git a/core/mixer/image/image_mixer.h b/core/mixer/image/image_mixer.h
index bdd2f5c9a89793f67d8252dd66c39c5d3429cc83..664d7c2377639faac2f84d056acf81173964a5e3 100644 (file)
--- a/core/mixer/image/image_mixer.h
+++ b/core/mixer/image/image_mixer.h
@@ -1,50 +1,61 @@
+/*\r
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+*\r
+* This file is part of CasparCG (www.casparcg.com).\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
+* Author: Robert Nagy, ronag89@gmail.com\r
+*/\r
+\r
 #pragma once\r
 \r
-#include "../gpu/host_buffer.h"\r
+#include "blend_modes.h"\r
 \r
-#include "../../video_format.h"\r
+#include <common/memory/safe_ptr.h>\r
+\r
+#include <core/producer/frame/frame_visitor.h>\r
 \r
-#include <boost/tuple/tuple.hpp>\r
-#include <boost/thread/future.hpp>\r
 #include <boost/noncopyable.hpp>\r
 \r
-#include <memory>\r
-#include <array>\r
+#include <boost/thread/future.hpp>\r
 \r
 namespace caspar { namespace core {\r
 \r
+class write_frame;\r
+class host_buffer;\r
+class ogl_device;\r
+struct video_format_desc;\r
 struct pixel_format_desc;\r
-       \r
-struct image_transform \r
-{\r
-       image_transform() : alpha(1.0), pos(boost::make_tuple(0.0, 0.0)), gain(1.0), uv(boost::make_tuple(0.0, 0.0, 0.0, 0.0)), mode(video_mode::invalid){}\r
-       double alpha;\r
-       double gain;\r
-       boost::tuple<double, double> pos;\r
-       boost::tuple<double, double, double, double> uv;\r
-       video_mode::type mode; \r
-\r
-       image_transform& operator*=(const image_transform &other);\r
-       const image_transform operator*(const image_transform &other) const;\r
-};\r
 \r
-class image_mixer : boost::noncopyable\r
+class image_mixer : public core::frame_visitor, boost::noncopyable\r
 {\r
 public:\r
-       image_mixer(const video_format_desc& format_desc);\r
-\r
-       void begin(const image_transform& transform);\r
-       void process(const pixel_format_desc& desc, std::vector<safe_ptr<host_buffer>>& buffers);\r
-       void end();\r
-\r
-       boost::unique_future<safe_ptr<const host_buffer>> begin_pass();\r
-       void end_pass();\r
-\r
-       std::vector<safe_ptr<host_buffer>> create_buffers(const pixel_format_desc& format);\r
-\r
+       image_mixer(const safe_ptr<ogl_device>& ogl);\r
+       \r
+       virtual void begin(core::basic_frame& frame);\r
+       virtual void visit(core::write_frame& frame);\r
+       virtual void end();\r
+\r
+       void begin_layer(blend_mode::type blend_mode);\r
+       void end_layer();\r
+               \r
+       boost::unique_future<safe_ptr<host_buffer>> operator()(const video_format_desc& format_desc);\r
+               \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