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 54c003e0bb82c1781c7e602b5757d3a63d9ca6d5..ea3a570e7e57a14a0a7460675bd347a734caf243 100644 (file)
--- a/core/consumer/frame_consumer_device.h
+++ b/core/consumer/frame_consumer_device.h
@@ -1,31 +1,50 @@
+/*\r
+* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+*\r
+*  This file is part of CasparCG.\r
+*\r
+*    CasparCG is free software: you can redistribute it and/or modify\r
+*    it under the terms of the GNU General Public License as published by\r
+*    the Free Software Foundation, either version 3 of the License, or\r
+*    (at your option) any later version.\r
+*\r
+*    CasparCG is distributed in the hope that it will be useful,\r
+*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+*    GNU General Public License for more details.\r
+\r
+*    You should have received a copy of the GNU General Public License\r
+*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
+*\r
+*/\r
 #pragma once\r
 \r
 #include "../consumer/frame_consumer.h"\r
 \r
-#include <common/utility/safe_ptr.h>\r
-\r
-#include <vector>\r
+#include <common/memory/safe_ptr.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r
-#include <tbb/concurrent_queue.h>\r
-\r
-#include <boost/thread/future.hpp>\r
-\r
-namespace caspar { namespace core {\r
+namespace caspar { \r
+       \r
+class executor;\r
        \r
-class frame_processor_device;\r
-class draw_frame;\r
+namespace core {\r
+       \r
+class video_channel_context;;\r
 \r
 class frame_consumer_device : boost::noncopyable\r
 {\r
 public:\r
-       frame_consumer_device(frame_consumer_device&& other);\r
-       frame_consumer_device(const video_format_desc& format_desc, const std::vector<safe_ptr<frame_consumer>>& consumers);\r
-       void consume(boost::unique_future<safe_ptr<const read_frame>>&& future_frame);\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 operator()(const safe_ptr<read_frame>& frame); // nothrow\r
 private:\r
        struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
+       safe_ptr<implementation> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file