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 b8c337389e75c99c4237b49f8674f95ff87d6608..664d7c2377639faac2f84d056acf81173964a5e3 100644 (file)
--- a/core/mixer/image/image_mixer.h
+++ b/core/mixer/image/image_mixer.h
@@ -1,55 +1,58 @@
 /*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
 *\r
-*  This file is part of CasparCG.\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
+* 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
+* 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 "blend_modes.h"\r
+\r
 #include <common/memory/safe_ptr.h>\r
 \r
 #include <core/producer/frame/frame_visitor.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r
+#include <boost/thread/future.hpp>\r
+\r
 namespace caspar { namespace core {\r
 \r
 class write_frame;\r
 class host_buffer;\r
-class video_channel_context;\r
+class ogl_device;\r
+struct video_format_desc;\r
 struct pixel_format_desc;\r
 \r
 class image_mixer : public core::frame_visitor, boost::noncopyable\r
 {\r
 public:\r
-       image_mixer(video_channel_context& context);\r
+       image_mixer(const safe_ptr<ogl_device>& ogl);\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
-       void begin_layer();\r
+       void begin_layer(blend_mode::type blend_mode);\r
        void end_layer();\r
-\r
-       image_mixer& operator=(image_mixer&& other);\r
-       \r
-       safe_ptr<host_buffer> render();\r
-\r
-       safe_ptr<write_frame> create_frame(void* tag, const core::pixel_format_desc& format);\r
-\r
+               \r
+       boost::unique_future<safe_ptr<host_buffer>> operator()(const video_format_desc& format_desc);\r
+               \r
 private:\r
        struct implementation;\r
        safe_ptr<implementation> impl_;\r