Merged asynchronous invocation of consumers from 2.0

[casparcg] / core / consumer / output.cpp

diff --git a/core/consumer/output.cpp b/core/consumer/output.cpp
index 43aa68f8f40b038ca3d5ca7c062f69e762d2168c..f6aaf6d96e1d2760488787fb4c42032e329543fd 100644 (file)
--- a/core/consumer/output.cpp
+++ b/core/consumer/output.cpp
@@ -177,22 +177,37 @@ public:
                        if(!frames_.full())
                                return;
 
-                       for(auto it = ports_.begin(); it != ports_.end();)
+                       std::map<int, boost::unique_future<bool>> send_results;
+
+                       // Start invocations
+                       for (auto it = ports_.begin(); it != ports_.end(); ++it)
                        {
                                auto& port      = it->second;
                                auto& frame     = frames_.at(port.buffer_depth()-minmax.first);
                                        
                                try
                                {
-                                       if(port.send(frame))
-                                               ++it;
-                                       else
-                                               ports_.erase(it++);                                     
+                                       send_results.insert(std::make_pair(it->first, port.send(frame)));
                                }
-                               catch(...)
+                               catch (...)
                                {
                                        CASPAR_LOG_CURRENT_EXCEPTION();
-                                       ports_.erase(it++);
+                                       ports_.erase(it);
+                               }
+                       }
+
+                       // Retrieve results
+                       for (auto it = send_results.begin(); it != send_results.end(); ++it)
+                       {
+                               try
+                               {
+                                       if (!it->second.get())
+                                               ports_.erase(it->first);
+                               }
+                               catch (...)
+                               {
+                                       CASPAR_LOG_CURRENT_EXCEPTION();
+                                       ports_.erase(it->first);
                                }
                        }
                });