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

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

diff --git a/core/producer/frame/image_transform.h b/core/producer/frame/image_transform.h
index 41fa20d4f928ede5f7979402f19b21ea96d3b841..385aeb09493f38a2d933cf3aaacc18f9b2a3d9a4 100644 (file)
--- a/core/producer/frame/image_transform.h
+++ b/core/producer/frame/image_transform.h
@@ -33,51 +33,6 @@ class image_transform
 {\r
 public:\r
        \r
-       struct blend_mode\r
-       {\r
-               enum type \r
-               {\r
-                       normal = 0,\r
-                       lighten,\r
-                       darken,\r
-                       multiply,\r
-                       average,\r
-                       add,\r
-                       subtract,\r
-                       difference,\r
-                       negation,\r
-                       exclusion,\r
-                       screen,\r
-                       overlay,\r
-                       soft_light,\r
-                       hard_light,\r
-                       color_dodge,\r
-                       color_burn,\r
-                       linear_dodge,\r
-                       linear_burn,\r
-                       linear_light,\r
-                       vivid_light,\r
-                       pin_light,\r
-                       hard_mix,\r
-                       reflect,\r
-                       glow,\r
-                       phoenix,\r
-                       contrast,\r
-                       saturation,\r
-                       color,\r
-                       luminosity,\r
-                       blend_mode_count \r
-               };\r
-       };\r
-\r
-       struct alpha_mode\r
-       {\r
-               enum type \r
-               {\r
-                       normal = 0,\r
-               };\r
-       };\r
-\r
        struct levels\r
        {\r
                levels() \r
@@ -99,10 +54,7 @@ public:
 \r
        void set_opacity(double value);\r
        double get_opacity() const;\r
-\r
-       void set_gain(double value);\r
-       double get_gain() const;\r
-\r
+       \r
        void set_brightness(double value);\r
        double get_brightness() const;\r
 \r
@@ -126,25 +78,16 @@ public:
 \r
        void set_clip_scale(double x, double y);\r
        std::array<double, 2> get_clip_scale() const;\r
-\r
-       void set_mode(video_mode::type mode);\r
-       video_mode::type get_mode() const;\r
-\r
+       \r
        image_transform& operator*=(const image_transform &other);\r
        const image_transform operator*(const image_transform &other) const;\r
 \r
        void set_is_key(bool value);\r
        bool get_is_key() const;\r
 \r
-       void set_deinterlace(bool value);\r
-       bool get_deinterlace() const;\r
-\r
-       void set_blend_mode(blend_mode::type value);\r
-       blend_mode::type get_blend_mode() const;\r
-       \r
-       void set_alpha_mode(alpha_mode::type value);\r
-       alpha_mode::type get_alpha_mode() const;\r
-\r
+       void set_field_mode(field_mode::type field_mode);\r
+       field_mode::type get_field_mode() const;\r
+               \r
 private:\r
        double opacity_;\r
        double gain_;\r
@@ -157,26 +100,14 @@ private:
        std::array<double, 2> fill_scale_; \r
        std::array<double, 2> clip_translation_; \r
        std::array<double, 2> clip_scale_; \r
-       video_mode::type mode_;\r
+       field_mode::type field_mode_;\r
        bool is_key_;\r
-       bool deinterlace_;\r
-       blend_mode::type blend_mode_;\r
-       alpha_mode::type alpha_mode_;\r
 };\r
 \r
-image_transform::blend_mode::type get_blend_mode(const std::wstring& str);\r
-image_transform::alpha_mode::type get_alpha_mode(const std::wstring& str);\r
-\r
 image_transform tween(double time, const image_transform& source, const image_transform& dest, double duration, const tweener_t& tweener);\r
 \r
-inline bool operator==(const image_transform& lhs, const image_transform& rhs)\r
-{\r
-       return memcmp(&lhs, &rhs, sizeof(image_transform)) == 0;\r
-}\r
-\r
-inline bool operator!=(const image_transform& lhs, const image_transform& rhs)\r
-{\r
-       return !(lhs == rhs);\r
-}\r
+bool operator<(const image_transform& lhs, const image_transform& rhs);\r
+bool operator==(const image_transform& lhs, const image_transform& rhs);\r
+bool operator!=(const image_transform& lhs, const image_transform& rhs);\r
 \r
 }}
\ No newline at end of file