git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

[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..266c3d43b8f923fc376561663bc3c203916fc9b4 100644 (file)
--- a/core/mixer/image/image_mixer.h
+++ b/core/mixer/image/image_mixer.h
@@ -19,36 +19,41 @@
 */\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(ogl_device& ogl, const 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
-       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
+       boost::unique_future<safe_ptr<host_buffer>> render();\r
 \r
-       safe_ptr<write_frame> create_frame(void* tag, const core::pixel_format_desc& format);\r
+       safe_ptr<write_frame> create_frame(const void* tag, const pixel_format_desc& format);\r
 \r
 private:\r
        struct implementation;\r