2.0. image_mixer: Refactored blend-modes.

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

diff --git a/core/producer/frame/image_transform.h b/core/producer/frame/image_transform.h
index 97b34d37d6c8caa2a0da74fd1f147fc4c33f8a8f..f116d383e27cdf2d4ef7810c3d29850726fe254e 100644 (file)
--- a/core/producer/frame/image_transform.h
+++ b/core/producer/frame/image_transform.h
@@ -33,44 +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
-                       replace,\r
-                       blend_mode_count \r
-               };\r
-       };\r
-       \r
        struct levels\r
        {\r
                levels() \r
@@ -122,10 +84,7 @@ public:
 \r
        void set_is_key(bool value);\r
        bool get_is_key() const;\r
-\r
-       void set_blend_mode(blend_mode::type value);\r
-       blend_mode::type get_blend_mode() const;\r
-       \r
+               \r
 private:\r
        double opacity_;\r
        double gain_;\r
@@ -140,11 +99,8 @@ private:
        std::array<double, 2> clip_scale_; \r
        video_mode::type mode_;\r
        bool is_key_;\r
-       blend_mode::type blend_mode_;\r
 };\r
 \r
-image_transform::blend_mode::type get_blend_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
 bool operator<(const image_transform& lhs, const image_transform& rhs);\r