2.0.0.2: Fixed data race in video_channel_context.

[casparcg] / core / consumer / frame_consumer_device.h

diff --git a/core/consumer/frame_consumer_device.h b/core/consumer/frame_consumer_device.h
index 29d6dfa9121a0bcda921af3ce66ef8ffbb701777..ea3a570e7e57a14a0a7460675bd347a734caf243 100644 (file)
--- a/core/consumer/frame_consumer_device.h
+++ b/core/consumer/frame_consumer_device.h
@@ -25,22 +25,23 @@
 \r
 #include <boost/noncopyable.hpp>\r
 \r
-namespace caspar { namespace core {\r
+namespace caspar { \r
        \r
-class basic_frame;\r
-struct video_format_desc;\r
+class executor;\r
+       \r
+namespace core {\r
+       \r
+class video_channel_context;;\r
 \r
 class frame_consumer_device : boost::noncopyable\r
 {\r
 public:\r
-       explicit frame_consumer_device(const video_format_desc& format_desc);\r
+       explicit frame_consumer_device(video_channel_context& video_channel);\r
 \r
        void add(int index, safe_ptr<frame_consumer>&& consumer);\r
        void remove(int index);\r
 \r
-       void send(const safe_ptr<const read_frame>& future_frame); // nothrow\r
-       \r
-       void set_video_format_desc(const video_format_desc& format_desc);\r
+       void operator()(const safe_ptr<read_frame>& frame); // nothrow\r
 private:\r
        struct implementation;\r
        safe_ptr<implementation> impl_;\r