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

diff --git a/core/producer/stage.cpp b/core/producer/stage.cpp
index 3ac8a983ec97b09f4dc8b3747983a43269a12c64..15ec46615d0eeab571267cd83974b22f07affdaa 100644 (file)
--- a/core/producer/stage.cpp
+++ b/core/producer/stage.cpp
@@ -48,7 +48,7 @@ namespace caspar { namespace core {
 struct stage::impl : public std::enable_shared_from_this<impl>\r
 {                      \r
        std::map<int, layer>                            layers_;        \r
-       std::map<int, tweened_transform>        transforms_;    \r
+       std::map<int, tweened_transform>        tweens_;        \r
        executor                                                        executor_;\r
 public:\r
        impl() : executor_(L"stage")\r
@@ -70,7 +70,8 @@ public:
 \r
                                tbb::parallel_for_each(layers_.begin(), layers_.end(), [&](std::map<int, layer>::value_type& layer)\r
                                {\r
-                                       auto transform = transforms_[layer.first].fetch_and_tick(1);\r
+                                       auto& tween             = tweens_[layer.first];\r
+                                       auto transform  = tween.fetch_and_tick(1);\r
 \r
                                        frame_producer::flags flags = frame_producer::flags::none;\r
                                        if(format_desc2.field_mode != field_mode::progressive)\r
@@ -90,7 +91,7 @@ public:
                                        if(format_desc2.field_mode != core::field_mode::progressive)\r
                                        {                               \r
                                                auto frame2 = spl::make_shared<core::draw_frame>(frame);\r
-                                               frame2->get_frame_transform() = transforms_[layer.first].fetch_and_tick(1);\r
+                                               frame2->get_frame_transform() = tween.fetch_and_tick(1);\r
                                                frame1 = core::draw_frame::interlace(frame1, frame2, format_desc2.field_mode);\r
                                        }\r
 \r
@@ -113,9 +114,9 @@ public:
                {\r
                        BOOST_FOREACH(auto& transform, transforms)\r
                        {\r
-                               auto src = transforms_[std::get<0>(transform)].fetch();\r
+                               auto src = tweens_[std::get<0>(transform)].fetch();\r
                                auto dst = std::get<1>(transform)(src);\r
-                               transforms_[std::get<0>(transform)] = tweened_transform(src, dst, std::get<2>(transform), std::get<3>(transform));\r
+                               tweens_[std::get<0>(transform)] = tweened_transform(src, dst, std::get<2>(transform), std::get<3>(transform));\r
                        }\r
                }, task_priority::high_priority);\r
        }\r
@@ -124,9 +125,9 @@ public:
        {\r
                executor_.begin_invoke([=]\r
                {\r
-                       auto src = transforms_[index].fetch();\r
+                       auto src = tweens_[index].fetch();\r
                        auto dst = transform(src);\r
-                       transforms_[index] = tweened_transform(src, dst, mix_duration, tween);\r
+                       tweens_[index] = tweened_transform(src, dst, mix_duration, tween);\r
                }, task_priority::high_priority);\r
        }\r
 \r
@@ -134,7 +135,7 @@ public:
        {\r
                executor_.begin_invoke([=]\r
                {\r
-                       transforms_.erase(index);\r
+                       tweens_.erase(index);\r
                }, task_priority::high_priority);\r
        }\r
 \r
@@ -142,7 +143,7 @@ public:
        {\r
                executor_.begin_invoke([=]\r
                {\r
-                       transforms_.clear();\r
+                       tweens_.clear();\r
                }, task_priority::high_priority);\r
        }\r
                \r