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

[casparcg] / core / producer / frame_producer.h

diff --git a/core/producer/frame_producer.h b/core/producer/frame_producer.h
index 3202d93e89a5ae97923d3e972604b8bf945b8994..830461d5b9841ca7a31c73bc28e0285033b1c88a 100644 (file)
--- a/core/producer/frame_producer.h
+++ b/core/producer/frame_producer.h
@@ -27,8 +27,13 @@
 #include <string>\r
 #include <vector>\r
 #include <stdint.h>\r
+#include <numeric>\r
 \r
-namespace caspar { namespace core {\r
+namespace caspar { \r
+       \r
+class executor;\r
+       \r
+namespace core {\r
 \r
 class basic_frame;\r
 struct frame_factory;\r
@@ -51,7 +56,7 @@ public:
        virtual safe_ptr<frame_producer> get_following_producer() const {return frame_producer::empty();}  // nothrow\r
        virtual void set_leading_producer(const safe_ptr<frame_producer>&) {}  // nothrow\r
                \r
-       virtual int64_t nb_frames() const {return 0;}\r
+       virtual int64_t nb_frames() const {return std::numeric_limits<int>::max();}\r
        \r
        virtual safe_ptr<basic_frame> receive(int hints) = 0;\r
        virtual safe_ptr<core::basic_frame> last_frame() const = 0;\r
@@ -65,5 +70,6 @@ typedef std::function<safe_ptr<core::frame_producer>(const safe_ptr<frame_factor
 void register_producer_factory(const producer_factory_t& factory); // Not thread-safe.\r
 safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>&, const std::vector<std::wstring>& params);\r
 \r
+safe_ptr<core::frame_producer> create_destroy_producer_proxy(executor& destroy_context, const safe_ptr<frame_producer>& producer);\r
 \r
 }}\r