2.0. video_format: Renamed video_mode to field_mode. image_mixer: Refactored field...

[casparcg] / modules / flash / producer / flash_producer.cpp

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index e9338c340bf81c920f49464161c2f8047eb2b92c..2eac9084fc584a7be1dbcb39f810086369dac68d 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -85,7 +85,7 @@ private:
 \r
 struct template_host\r
 {\r
-       std::string  video_mode;\r
+       std::string  field_mode;\r
        std::string  filename;\r
        size_t           width;\r
        size_t           height;\r
@@ -99,7 +99,7 @@ template_host get_template_host(const core::video_format_desc& desc)
                try\r
                {\r
                        template_host template_host;\r
-                       template_host.video_mode                = xml_mapping.second.get("video-mode", narrow(desc.name));\r
+                       template_host.field_mode                = xml_mapping.second.get("video-mode", narrow(desc.name));\r
                        template_host.filename                  = xml_mapping.second.get("filename", "cg.fth");\r
                        template_host.width                             = xml_mapping.second.get("width", desc.width);\r
                        template_host.height                    = xml_mapping.second.get("height", desc.height);\r
@@ -108,9 +108,9 @@ template_host get_template_host(const core::video_format_desc& desc)
                catch(...){}\r
        }\r
 \r
-       auto template_host_it = boost::find_if(template_hosts, [&](template_host template_host){return template_host.video_mode == narrow(desc.name);});\r
+       auto template_host_it = boost::find_if(template_hosts, [&](template_host template_host){return template_host.field_mode == narrow(desc.name);});\r
        if(template_host_it == template_hosts.end())\r
-               template_host_it = boost::find_if(template_hosts, [&](template_host template_host){return template_host.video_mode == "";});\r
+               template_host_it = boost::find_if(template_hosts, [&](template_host template_host){return template_host.field_mode == "";});\r
 \r
        if(template_host_it != template_hosts.end())\r
                return *template_host_it;\r