2.0 image_mixer: Removed "gain" in favor of "brightness".

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

diff --git a/core/producer/frame/image_transform.cpp b/core/producer/frame/image_transform.cpp
index 6c3d6eb90a52372752375417535df73e7cb20860..7ca46e75c047576d01cc170dbddbe59a8a4c917b 100644 (file)
--- a/core/producer/frame/image_transform.cpp
+++ b/core/producer/frame/image_transform.cpp
@@ -30,7 +30,6 @@ namespace caspar { namespace core {
                \r
 image_transform::image_transform() \r
        : opacity_(1.0)\r
-       , gain_(1.0)\r
        , brightness_(1.0)\r
        , contrast_(1.0)\r
        , saturation_(1.0)\r
@@ -53,16 +52,6 @@ double image_transform::get_opacity() const
        return opacity_;\r
 }\r
 \r
-void image_transform::set_gain(double value)\r
-{\r
-       gain_ = std::max(0.0, value);\r
-}\r
-\r
-double image_transform::get_gain() const\r
-{\r
-       return gain_;\r
-}\r
-\r
 void image_transform::set_brightness(double value)\r
 {\r
        brightness_ = std::max(0.0, value);\r
@@ -162,7 +151,6 @@ image_transform& image_transform::operator*=(const image_transform &other)
 {\r
        opacity_                                *= other.opacity_;      \r
        blend_mode_                              = std::max(blend_mode_, other.blend_mode_);\r
-       gain_                                   *= other.gain_;\r
        brightness_                             *= other.brightness_;\r
        contrast_                               *= other.contrast_;\r
        saturation_                             *= other.saturation_;\r
@@ -205,7 +193,6 @@ image_transform tween(double time, const image_transform& source, const image_tr
        image_transform result; \r
        result.set_blend_mode           (std::max(source.get_blend_mode(), dest.get_blend_mode()));\r
        result.set_is_key                       (source.get_is_key() | dest.get_is_key());\r
-       result.set_gain                         (do_tween(time, source.get_gain(), dest.get_gain(), duration, tweener));\r
        result.set_brightness           (do_tween(time, source.get_brightness(), dest.get_brightness(), duration, tweener));\r
        result.set_contrast                     (do_tween(time, source.get_contrast(), dest.get_contrast(), duration, tweener));\r
        result.set_saturation           (do_tween(time, source.get_saturation(), dest.get_saturation(), duration, tweener));\r