Changed meaning of frame variable in scene to a continously animating variable. The...

[casparcg] / core / producer / scene / xml_scene_producer.cpp

diff --git a/core/producer/scene/xml_scene_producer.cpp b/core/producer/scene/xml_scene_producer.cpp
index 1fe9e38290dbc3abaa9884d6262c6a2831867c60..5eacb6c368f92359bdfe35703f16d27b6e57ae4f 100644 (file)
--- a/core/producer/scene/xml_scene_producer.cpp
+++ b/core/producer/scene/xml_scene_producer.cpp
@@ -206,26 +206,29 @@ spl::shared_ptr<core::frame_producer> create_xml_scene_producer(
                }
        }
 
-       for (auto& elem : root | witerate_children(L"scene.timelines") | welement_context_iteration)
+       if (root.get_child_optional(L"scene.timelines"))
        {
-               ptree_verify_element_name(elem, L"timeline");
+               for (auto& elem : root | witerate_children(L"scene.timelines") | welement_context_iteration)
+               {
+                       ptree_verify_element_name(elem, L"timeline");
 
-               auto& variable = scene->get_variable(ptree_get<std::wstring>(elem.second, L"<xmlattr>.variable"));
+                       auto& variable = scene->get_variable(ptree_get<std::wstring>(elem.second, L"<xmlattr>.variable"));
 
-               for (auto& k : elem.second)
-               {
-                       if (k.first == L"<xmlattr>")
-                               continue;
+                       for (auto& k : elem.second)
+                       {
+                               if (k.first == L"<xmlattr>")
+                                       continue;
 
-                       ptree_verify_element_name(k, L"keyframe");
+                               ptree_verify_element_name(k, L"keyframe");
 
-                       auto easing     = k.second.get(L"<xmlattr>.easing", L"");
-                       auto at         = ptree_get<int64_t>(k.second, L"<xmlattr>.at");
+                               auto easing = k.second.get(L"<xmlattr>.easing", L"");
+                               auto at = ptree_get<int64_t>(k.second, L"<xmlattr>.at");
 
-                       if (variable.is<double>())
-                               scene->add_keyframe(variable.as<double>(), ptree_get_value<double>(k.second), at, easing);
-                       else if (variable.is<int>())
-                               scene->add_keyframe(variable.as<int>(), ptree_get_value<int>(k.second), at, easing);
+                               if (variable.is<double>())
+                                       scene->add_keyframe(variable.as<double>(), ptree_get_value<double>(k.second), at, easing);
+                               else if (variable.is<int>())
+                                       scene->add_keyframe(variable.as<int>(), ptree_get_value<int>(k.second), at, easing);
+                       }
                }
        }