Merged asynchronous invocation of consumers from 2.0

[casparcg] / modules / screen / consumer / screen_consumer.cpp

diff --git a/modules/screen/consumer/screen_consumer.cpp b/modules/screen/consumer/screen_consumer.cpp
index 45b5b8a30bcf90aba773e7abd093c823dbfd9b6f..a14ed2d12cfecdc07e7405b9328b6da248af4a90 100644 (file)
--- a/modules/screen/consumer/screen_consumer.cpp
+++ b/modules/screen/consumer/screen_consumer.cpp
@@ -32,6 +32,7 @@
 #include <common/memshfl.h>
 #include <common/utf.h>
 #include <common/prec_timer.h>
+#include <common/future.h>
 
 #include <ffmpeg/producer/filter/filter.h>
 
@@ -443,11 +444,12 @@ public:
        }
 
 
-       bool send(core::const_frame frame)
+       boost::unique_future<bool> send(core::const_frame frame)
        {
                if(!frame_buffer_.try_push(frame))
                        graph_->set_tag("dropped-frame");
-               return is_running_;
+
+               return wrap_as_future(is_running_.load());
        }
                
        std::wstring print() const
@@ -531,7 +533,7 @@ public:
                consumer_.reset(new screen_consumer(config_, format_desc, channel_index));
        }
        
-       bool send(core::const_frame frame) override
+       boost::unique_future<bool> send(core::const_frame frame) override
        {
                return consumer_->send(frame);
        }