git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/producer/stage.cpp b/core/producer/stage.cpp
index ae7a7f14af78e4451f7effdee2c48ff506aa8adf..475e2bdc38045e50f7b7e01171bfe6b4489e7622 100644 (file)
--- a/core/producer/stage.cpp
+++ b/core/producer/stage.cpp
@@ -170,17 +170,7 @@ public:
                        CASPAR_LOG_CURRENT_EXCEPTION();\r
                }               \r
        }\r
-               \r
-       void apply_transform(int index, const frame_transform& transform, unsigned int mix_duration, const std::wstring& tween)\r
-       {\r
-               executor_.begin_invoke([=]\r
-               {\r
-                       auto src = transforms_[index].fetch();\r
-                       auto dst = transform;\r
-                       transforms_[index] = tweened_transform<frame_transform>(src, dst, mix_duration, tween);\r
-               }, high_priority);\r
-       }\r
-                               \r
+                                               \r
        void apply_transform(int index, const std::function<frame_transform(frame_transform)>& transform, unsigned int mix_duration, const std::wstring& tween)\r
        {\r
                executor_.begin_invoke([=]\r
@@ -349,7 +339,6 @@ public:
 };\r
 \r
 stage::stage(const safe_ptr<stage::target_t>& target, const safe_ptr<diagnostics::graph>& graph, const struct video_format_desc& format_desc) : impl_(new impl(target, graph, format_desc)){}\r
-void stage::apply_transform(int index, const core::frame_transform& transform, unsigned int mix_duration, const std::wstring& tween){impl_->apply_transform(index, transform, mix_duration, tween);}\r
 void stage::apply_transform(int index, const std::function<core::frame_transform(core::frame_transform)>& transform, unsigned int mix_duration, const std::wstring& tween){impl_->apply_transform(index, transform, mix_duration, tween);}\r
 void stage::clear_transforms(int index){impl_->clear_transforms(index);}\r
 void stage::clear_transforms(){impl_->clear_transforms();}\r

diff --git a/core/producer/stage.h b/core/producer/stage.h
index 95b44ea8576133efa41bfe4c99816ec9b1a6d823..f5ddc1101532a0318c559ceae835c28914f74815 100644 (file)
--- a/core/producer/stage.h
+++ b/core/producer/stage.h
@@ -47,7 +47,6 @@ public:
        \r
        // stage\r
        \r
-       void apply_transform(int index, const struct frame_transform& transform, unsigned int mix_duration = 0, const std::wstring& tween = L"linear");\r
        void apply_transform(int index, const std::function<struct frame_transform(struct frame_transform)>& transform, unsigned int mix_duration = 0, const std::wstring& tween = L"linear");\r
        void clear_transforms(int index);\r
        void clear_transforms();\r