2.1.0: Rename set_transform to apply_transform.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2112 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/producer/stage.cpp b/core/producer/stage.cpp
index 896138d78a18c3a8e631e88a66a4720e3b022eac..ae7a7f14af78e4451f7effdee2c48ff506aa8adf 100644 (file)
--- a/core/producer/stage.cpp
+++ b/core/producer/stage.cpp
@@ -171,7 +171,7 @@ public:
                }               \r
        }\r
                \r
-       void set_transform(int index, const frame_transform& transform, unsigned int mix_duration, const std::wstring& tween)\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
@@ -349,8 +349,8 @@ 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::set_frame_transform(int index, const core::frame_transform& transform, unsigned int mix_duration, const std::wstring& tween){impl_->set_transform(index, transform, mix_duration, tween);}\r
-void stage::apply_frame_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::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
 void stage::spawn_token(){impl_->spawn_token();}\r

diff --git a/core/producer/stage.h b/core/producer/stage.h
index 02ac971f36824e7ecf5b28905c21b352a26c0e2e..95b44ea8576133efa41bfe4c99816ec9b1a6d823 100644 (file)
--- a/core/producer/stage.h
+++ b/core/producer/stage.h
@@ -29,26 +29,26 @@
 #include <common/concurrency/target.h>\r
 \r
 #include <boost/property_tree/ptree_fwd.hpp>\r
-#include <boost/thread/future.hpp>\r
 \r
 #include <functional>\r
 \r
 FORWARD2(caspar, diagnostics, class graph);\r
+FORWARD1(boost, template<typename> class unique_future);\r
 \r
 namespace caspar { namespace core {\r
        \r
 class stage sealed\r
 {\r
        CASPAR_NO_COPY(stage);\r
-public:\r
+public:        \r
        typedef target<std::pair<std::map<int, safe_ptr<class basic_frame>>, std::shared_ptr<void>>> target_t;\r
 \r
        stage(const safe_ptr<target_t>& target, const safe_ptr<diagnostics::graph>& graph, const struct video_format_desc& format_desc);\r
        \r
        // stage\r
        \r
-       void set_frame_transform(int index, const struct frame_transform& transform, unsigned int mix_duration = 0, const std::wstring& tween = L"linear");\r
-       void apply_frame_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 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
 \r

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index 22a375f9c5ed8e4e370c6528e446ab42fad9cd3c..62404dfc2298bc3c487ff6e62e6759b1bbae1f5e 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -266,7 +266,7 @@ bool ChannelGridCommand::DoExecute()
                                transform.clip_scale[1]                 = delta;                        \r
                                return transform;\r
                        };\r
-                       self->stage()->apply_frame_transform(index, transform);\r
+                       self->stage()->apply_transform(index, transform);\r
                }\r
        }\r
 \r
@@ -332,7 +332,7 @@ bool MixerCommand::DoExecute()
                        };\r
 \r
                        int layer = GetLayerIndex();\r
-                       GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform);\r
+                       GetChannel()->stage()->apply_transform(GetLayerIndex(), transform);\r
                }\r
                else if(_parameters[0] == L"OPACITY")\r
                {\r
@@ -348,7 +348,7 @@ bool MixerCommand::DoExecute()
                        };\r
 \r
                        int layer = GetLayerIndex();\r
-                       GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
+                       GetChannel()->stage()->apply_transform(GetLayerIndex(), transform, duration, tween);\r
                }\r
                else if(_parameters[0] == L"FILL" || _parameters[0] == L"FILL_RECT")\r
                {\r
@@ -373,7 +373,7 @@ bool MixerCommand::DoExecute()
                        };\r
                                \r
                        int layer = GetLayerIndex();\r
-                       GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
+                       GetChannel()->stage()->apply_transform(GetLayerIndex(), transform, duration, tween);\r
                }\r
                else if(_parameters[0] == L"CLIP" || _parameters[0] == L"CLIP_RECT")\r
                {\r
@@ -394,7 +394,7 @@ bool MixerCommand::DoExecute()
                        };\r
                                \r
                        int layer = GetLayerIndex();\r
-                       GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
+                       GetChannel()->stage()->apply_transform(GetLayerIndex(), transform, duration, tween);\r
                }\r
                else if(_parameters[0] == L"GRID")\r
                {\r
@@ -419,7 +419,7 @@ bool MixerCommand::DoExecute()
                                                transform.clip_scale[1]                 = delta;                        \r
                                                return transform;\r
                                        };\r
-                                       GetChannel()->stage()->apply_frame_transform(index, transform, duration, tween);\r
+                                       GetChannel()->stage()->apply_transform(index, transform, duration, tween);\r
                                }\r
                        }\r
                }\r
@@ -441,7 +441,7 @@ bool MixerCommand::DoExecute()
                        };\r
                                \r
                        int layer = GetLayerIndex();\r
-                       GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);      \r
+                       GetChannel()->stage()->apply_transform(GetLayerIndex(), transform, duration, tween);    \r
                }\r
                else if(_parameters[0] == L"SATURATION")\r
                {\r
@@ -455,7 +455,7 @@ bool MixerCommand::DoExecute()
                        };\r
                                \r
                        int layer = GetLayerIndex();\r
-                       GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);      \r
+                       GetChannel()->stage()->apply_transform(GetLayerIndex(), transform, duration, tween);    \r
                }\r
                else if(_parameters[0] == L"CONTRAST")\r
                {\r
@@ -469,7 +469,7 @@ bool MixerCommand::DoExecute()
                        };\r
                                \r
                        int layer = GetLayerIndex();\r
-                       GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);      \r
+                       GetChannel()->stage()->apply_transform(GetLayerIndex(), transform, duration, tween);    \r
                }\r
                else if(_parameters[0] == L"LEVELS")\r
                {\r
@@ -489,7 +489,7 @@ bool MixerCommand::DoExecute()
                        };\r
                                \r
                        int layer = GetLayerIndex();\r
-                       GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);      \r
+                       GetChannel()->stage()->apply_transform(GetLayerIndex(), transform, duration, tween);    \r
                }\r
                else if(_parameters[0] == L"VOLUME")\r
                {\r
@@ -504,7 +504,7 @@ bool MixerCommand::DoExecute()
                        };\r
                                \r
                        int layer = GetLayerIndex();\r
-                       GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
+                       GetChannel()->stage()->apply_transform(GetLayerIndex(), transform, duration, tween);\r
                }\r
                else if(_parameters[0] == L"CLEAR")\r
                {\r