2.0.0.2: All pipeline stages share thread context. This is a better and simpler desig...

[casparcg] / core / mixer / frame_mixer_device.h

diff --git a/core/mixer/frame_mixer_device.h b/core/mixer/frame_mixer_device.h
index e2992a76845d4988557d4741253f5bc06c09d493..b6d58be5a6370c1171ca254093628277cc5e193b 100644 (file)
--- a/core/mixer/frame_mixer_device.h
+++ b/core/mixer/frame_mixer_device.h
@@ -28,6 +28,8 @@
 #include <map>\r
 \r
 namespace caspar { \r
+\r
+class executor;\r
        \r
 namespace core {\r
 \r
@@ -43,8 +45,7 @@ class frame_mixer_device : public core::frame_factory
 public:        \r
        typedef std::function<void(const safe_ptr<core::read_frame>&)> output_t;\r
 \r
-       frame_mixer_device(const core::video_format_desc& format_desc, const output_t& output, const safe_ptr<ogl_device>& ogl);\r
-       frame_mixer_device(frame_mixer_device&& other); // nothrow\r
+       frame_mixer_device(executor& context, const core::video_format_desc& format_desc, const output_t& output, ogl_device& ogl);\r
                \r
        void send(const std::map<int, safe_ptr<core::basic_frame>>& frames); // nothrow\r
                \r