git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

[casparcg] / core / producer / stage.cpp

diff --git a/core/producer/stage.cpp b/core/producer/stage.cpp
index 72a2e80e7c38119bfe03f8b1d886d16193e41a57..6c7816ba91d345de3c42f583f86efb1fcf3e0759 100644 (file)
--- a/core/producer/stage.cpp
+++ b/core/producer/stage.cpp
@@ -85,18 +85,26 @@ public:
        }\r
                                                \r
        std::map<int, safe_ptr<basic_frame>> execute()\r
-       {                       \r
-               std::map<int, safe_ptr<basic_frame>> frames;\r
+       {               \r
+               try\r
+               {\r
+                       std::map<int, safe_ptr<basic_frame>> frames;\r
                \r
-               BOOST_FOREACH(auto& layer, layers_)                     \r
-                       frames[layer.first] = basic_frame::empty();     \r
+                       BOOST_FOREACH(auto& layer, layers_)                     \r
+                               frames[layer.first] = basic_frame::empty();     \r
+\r
+                       tbb::parallel_for_each(layers_.begin(), layers_.end(), [&](std::map<int, layer>::value_type& layer) \r
+                       {\r
+                               frames[layer.first] = layer.second.receive();   \r
+                       });\r
 \r
-               tbb::parallel_for_each(layers_.begin(), layers_.end(), [&](std::map<int, layer>::value_type& layer) \r
+                       return frames;\r
+               }\r
+               catch(...)\r
                {\r
-                       frames[layer.first] = layer.second.receive();   \r
-               });\r
-               \r
-               return frames;\r
+                       CASPAR_LOG(error) << L"[stage] Error detected";\r
+                       throw;\r
+               }               \r
        }\r
 \r
        void load(int index, const safe_ptr<frame_producer>& producer, bool preview, int auto_play_delta)\r
@@ -151,7 +159,7 @@ public:
        {\r
                channel_.execution().invoke([&]\r
                {\r
-                       layers_[index].swap(layers_[other_index]);\r
+                       std::swap(layers_[index], layers_[other_index]);\r
                }, high_priority);\r
        }\r
 \r
@@ -161,7 +169,10 @@ public:
                        swap_layer(index, other_index);\r
                else\r
                {\r
-                       auto func = [&]{layers_[index].swap(other.impl_->layers_[other_index]);};               \r
+                       auto func = [&]\r
+                       {\r
+                               std::swap(layers_[index], other.impl_->layers_[other_index]);\r
+                       };              \r
                        channel_.execution().invoke([&]{other.impl_->channel_.execution().invoke(func, high_priority);}, high_priority);\r
                }\r
        }\r
@@ -173,19 +184,9 @@ public:
                \r
                auto func = [&]\r
                {\r
-                       auto sel_first = [](const std::pair<int, layer>& pair){return pair.first;};\r
-\r
-                       std::set<int> indices;\r
-                       auto inserter = std::inserter(indices, indices.begin());\r
-\r
-                       std::transform(layers_.begin(), layers_.end(), inserter, sel_first);\r
-                       std::transform(other.impl_->layers_.begin(), other.impl_->layers_.end(), inserter, sel_first);\r
-\r
-                       BOOST_FOREACH(auto index, indices)\r
-                               layers_[index].swap(other.impl_->layers_[index]);\r
-               };\r
-               \r
-               channel_.execution().invoke([&]{other.impl_->channel_.execution().invoke(func, high_priority);});\r
+                       std::swap(layers_, other.impl_->layers_);\r
+               };              \r
+               channel_.execution().invoke([&]{other.impl_->channel_.execution().invoke(func, high_priority);}, high_priority);\r
        }\r
 \r
        layer_status get_status(int index)\r