2.0.0.2: SET MODE: Does not clear producers.

[casparcg] / core / mixer / frame_mixer_device.h

diff --git a/core/mixer/frame_mixer_device.h b/core/mixer/frame_mixer_device.h
index b6d58be5a6370c1171ca254093628277cc5e193b..5ce3ffb279b0d7d1447aacbee3849f577f92d86b 100644 (file)
--- a/core/mixer/frame_mixer_device.h
+++ b/core/mixer/frame_mixer_device.h
@@ -39,19 +39,19 @@ class basic_frame;
 class audio_transform;\r
 class image_transform;\r
 class ogl_device;\r
+struct channel_context;\r
 \r
 class frame_mixer_device : public core::frame_factory\r
 {\r
 public:        \r
        typedef std::function<void(const safe_ptr<core::read_frame>&)> output_t;\r
 \r
-       frame_mixer_device(executor& context, const core::video_format_desc& format_desc, const output_t& output, ogl_device& ogl);\r
+       frame_mixer_device(channel_context& channel, const output_t& output);\r
                \r
        void send(const std::map<int, safe_ptr<core::basic_frame>>& frames); // nothrow\r
                \r
        safe_ptr<core::write_frame> create_frame(void* tag, const core::pixel_format_desc& desc);               \r
-       safe_ptr<core::write_frame> create_frame(void* tag, size_t width, size_t height, core::pixel_format::type pix_fmt = core::pixel_format::bgra);                  \r
-       safe_ptr<core::write_frame> create_frame(void* tag, core::pixel_format::type pix_fmt = core::pixel_format::bgra);\r
+       safe_ptr<core::write_frame> create_frame(void* tag, size_t width, size_t height, core::pixel_format::type pix_fmt = core::pixel_format::bgra);          \r
        \r
        const core::video_format_desc& get_video_format_desc() const; // nothrow\r
 \r