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

[casparcg] / core / producer / frame / basic_frame.h

diff --git a/core/producer/frame/basic_frame.h b/core/producer/frame/basic_frame.h
index 9f326f2d452be28602cb3eafd1ae148963064938..d68d8e4f650ad2518c6714780638fe972afe7427 100644 (file)
--- a/core/producer/frame/basic_frame.h
+++ b/core/producer/frame/basic_frame.h
@@ -55,10 +55,8 @@ public:
 \r
        const audio_transform& get_audio_transform() const;\r
        audio_transform& get_audio_transform();\r
-\r
-       core::video_mode::type get_mode() const;\r
-               \r
-       static safe_ptr<basic_frame> interlace(const safe_ptr<basic_frame>& frame1, const safe_ptr<basic_frame>& frame2, video_mode::type mode);\r
+                       \r
+       static safe_ptr<basic_frame> interlace(const safe_ptr<basic_frame>& frame1, const safe_ptr<basic_frame>& frame2, field_mode::type mode);\r
        static safe_ptr<basic_frame> combine(const safe_ptr<basic_frame>& frame1, const safe_ptr<basic_frame>& frame2);\r
        static safe_ptr<basic_frame> fill_and_key(const safe_ptr<basic_frame>& fill, const safe_ptr<basic_frame>& key);\r
                \r