2.0 image_mixer: Refactored, core: Fixed destruction proxy usage.

[casparcg] / core / video_channel.h

diff --git a/core/video_channel.h b/core/video_channel.h
index a87ea6309bce15250e3057a4ff1035d9a0e83c54..7a0225b6b0395d99281ebd3a558b2564b5da654c 100644 (file)
--- a/core/video_channel.h
+++ b/core/video_channel.h
@@ -20,17 +20,18 @@
 \r
 #pragma once\r
 \r
-#include "consumer/frame_consumer_device.h"\r
-#include "mixer/frame_mixer_device.h"\r
-#include "producer/frame_producer_device.h"\r
-\r
 #include <common/memory/safe_ptr.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r
 namespace caspar { namespace core {\r
        \r
+class stage;\r
+class mixer;\r
+class output;\r
 class ogl_device;\r
+struct video_format_desc;\r
+class video_channel_context;\r
 \r
 class video_channel : boost::noncopyable\r
 {\r
@@ -38,9 +39,11 @@ public:
        explicit video_channel(int index, const video_format_desc& format_desc, ogl_device& ogl);\r
        video_channel(video_channel&& other);\r
 \r
-       safe_ptr<frame_producer_device> producer();\r
-       safe_ptr<frame_mixer_device>    mixer();\r
-       safe_ptr<frame_consumer_device> consumer();\r
+       safe_ptr<stage> stage();\r
+       safe_ptr<mixer> mixer();\r
+       safe_ptr<output> output();\r
+\r
+       video_channel_context& context();\r
 \r
        video_format_desc get_video_format_desc() const;\r
        void set_video_format_desc(const video_format_desc& format_desc);\r