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

[casparcg] / core / video_format.h

diff --git a/core/video_format.h b/core/video_format.h
index ee510e2f627ebf3f08bd4be0299b77fd2d29f0fb..da8a6565a03b8d8c40d98a9013610f2d7d7a48e1 100644 (file)
--- a/core/video_format.h
+++ b/core/video_format.h
@@ -51,16 +51,17 @@ struct video_format
        };\r
 };\r
 \r
-struct video_mode \r
+struct field_mode \r
 { \r
        enum type\r
        {\r
+               empty           = 0,\r
                lower           = 1,\r
                upper           = 2,\r
                progressive = 3 // NOTE: progressive == lower | upper;\r
        };\r
 \r
-       static std::wstring print(video_mode::type value)\r
+       static std::wstring print(field_mode::type value)\r
        {\r
                switch(value)\r
                {\r
@@ -82,7 +83,7 @@ struct video_format_desc
 \r
        size_t                                  width;          // output frame width\r
        size_t                                  height;         // output frame height\r
-       video_mode::type                mode;           // progressive, interlaced upper field first, interlaced lower field first\r
+       field_mode::type                mode;           // progressive, interlaced upper field first, interlaced lower field first\r
        double                                  fps;            // actual framerate, e.g. i50 = 25 fps, p50 = 50 fps\r
        size_t                                  time_scale;\r
        size_t                                  duration;\r