2.0. image_mixer: Fixed layer mixing.

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

diff --git a/core/producer/frame/image_transform.h b/core/producer/frame/image_transform.h
index 4ec5fe7a100eda51932f4a35d39ac384c368c6e5..df24a689db393c7fdba666b64c646b7ad4dab149 100644 (file)
--- a/core/producer/frame/image_transform.h
+++ b/core/producer/frame/image_transform.h
@@ -66,18 +66,11 @@ public:
                        saturation,\r
                        color,\r
                        luminosity,\r
+                       replace,\r
                        blend_mode_count \r
                };\r
        };\r
-\r
-       struct alpha_mode\r
-       {\r
-               enum type \r
-               {\r
-                       normal = 0,\r
-               };\r
-       };\r
-\r
+       \r
        struct levels\r
        {\r
                levels() \r
@@ -133,15 +126,9 @@ public:
        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
 private:\r
        double opacity_;\r
        double gain_;\r
@@ -156,13 +143,10 @@ private:
        std::array<double, 2> clip_scale_; \r
        video_mode::type 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