[scene] Fixed double evaluation of expressions

[casparcg] / common / tweener.h

diff --git a/common/tweener.h b/common/tweener.h
index 3a842a36b3401f671b819895f7072b2b8462f0ab..b5231f816375646711c21b6a66760ade521f61d9 100644 (file)
--- a/common/tweener.h
+++ b/common/tweener.h
@@ -47,7 +47,6 @@ public:
         * @param name The name of the tween function to use.
         */
        tweener(const std::wstring& name = L"linear");
-       tweener(const wchar_t* name);
 
        /**
         * @return The possible tween function names. Some of them may also support
@@ -73,8 +72,12 @@ public:
         *             than b or greater than b + c for some tweener functions.
         */
        double operator()(double t, double b , double c, double d) const;
+
+       bool operator==(const tweener& other) const;
+       bool operator!=(const tweener& other) const;
 private:
-       std::function<double(double, double, double, double)> func_;
+       std::function<double(double, double, double, double)>   func_;
+       std::wstring                                                                                    name_;
 };
 
 }