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

[casparcg] / core / mixer / mixer.cpp

diff --git a/core/mixer/mixer.cpp b/core/mixer/mixer.cpp
index e06bd2df1c9ff0c5fb0e7c1f86d8a02b6f11b17e..c663d7d2250cdb222a3f35b585b102dcbd361c4e 100644 (file)
--- a/core/mixer/mixer.cpp
+++ b/core/mixer/mixer.cpp
@@ -210,7 +210,7 @@ private:
                        auto frame1 = make_safe<core::basic_frame>(frame.second);\r
                        frame1->get_image_transform() = image_transforms[frame.first].fetch_and_tick(1);\r
                                                \r
-                       if(channel_.get_format_desc().mode != core::video_mode::progressive)\r
+                       if(channel_.get_format_desc().mode != core::field_mode::progressive)\r
                        {\r
                                auto frame2 = make_safe<core::basic_frame>(frame.second);\r
                                frame2->get_image_transform() = image_transforms[frame.first].fetch_and_tick(1);\r
@@ -232,7 +232,7 @@ private:
 \r
                BOOST_FOREACH(auto& frame, frames)\r
                {\r
-                       const unsigned int num = channel_.get_format_desc().mode == core::video_mode::progressive ? 1 : 2;\r
+                       const unsigned int num = channel_.get_format_desc().mode == core::field_mode::progressive ? 1 : 2;\r
 \r
                        auto frame1 = make_safe<core::basic_frame>(frame.second);\r
                        frame1->get_audio_transform() = audio_transforms[frame.first].fetch_and_tick(num);\r