2.0. - amcp: Fixed MIX command.

     - stage: Added some more logging.

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

diff --git a/core/consumer/output.cpp b/core/consumer/output.cpp
index 2f779325ecf8a8e3fb05e901e765268864424626..4da874b843b65c7935c29407f81a39ba0c9a38fc 100644 (file)
--- a/core/consumer/output.cpp
+++ b/core/consumer/output.cpp
@@ -131,7 +131,7 @@ private:
 \r
        safe_ptr<const read_frame> get_key_frame(const safe_ptr<const read_frame>& frame)\r
        {\r
-               bool has_key_only = std::any_of(consumers_.begin(), consumers_.end(), [](const decltype(*consumers_.begin())& p)\r
+               const bool has_key_only = std::any_of(consumers_.begin(), consumers_.end(), [](const decltype(*consumers_.begin())& p)\r
                {\r
                        return p.second->key_only();\r
                });\r

diff --git a/core/producer/stage.cpp b/core/producer/stage.cpp
index 809e93f271f8cb69dc75ab9e317ab9c04bfba95f..180bb8307ec316651a5fcb75ccdfb6086cd08c48 100644 (file)
--- a/core/producer/stage.cpp
+++ b/core/producer/stage.cpp
@@ -112,6 +112,7 @@ public:
                channel_.execution().invoke([&]\r
                {\r
                        layers_[index].load(make_safe<destroy_producer_proxy>(channel_.destruction(), producer), preview);\r
+                       CASPAR_LOG(info) << print() << " layer [ " << index <<  "] Loaded: " << producer << ".";\r
                });\r
        }\r
 \r
@@ -120,6 +121,7 @@ public:
                channel_.execution().invoke([&]\r
                {\r
                        layers_[index].pause();\r
+                       CASPAR_LOG(info) << print() << " layer [ " << index <<  "] Paused.";\r
                });\r
        }\r
 \r
@@ -128,6 +130,7 @@ public:
                channel_.execution().invoke([&]\r
                {\r
                        layers_[index].play();\r
+                       CASPAR_LOG(info) << print() << " layer [ " << index <<  "] Playing.";\r
                });\r
        }\r
 \r
@@ -136,6 +139,7 @@ public:
                channel_.execution().invoke([&]\r
                {\r
                        layers_[index].stop();\r
+                       CASPAR_LOG(info) << print() << " layer [ " << index <<  "] Stopped.";\r
                });\r
        }\r
 \r
@@ -144,6 +148,7 @@ public:
                channel_.execution().invoke([&]\r
                {\r
                        layers_.erase(index);\r
+                       CASPAR_LOG(info) << print() << " layer [ " << index <<  "] Cleared.";\r
                });\r
        }\r
                \r
@@ -152,6 +157,7 @@ public:
                channel_.execution().invoke([&]\r
                {\r
                        layers_.clear();\r
+                       CASPAR_LOG(info) << print() << " Cleared.";\r
                });\r
        }       \r
        \r
@@ -212,6 +218,12 @@ public:
        {\r
                return channel_.execution().begin_invoke([=]{return layers_[index].background();});\r
        }\r
+\r
+       std::wstring print() const\r
+       {\r
+               return L"stage [" + boost::lexical_cast<std::wstring>(channel_.index()) + L"]";\r
+       }\r
+\r
 };\r
 \r
 stage::stage(video_channel_context& video_channel) : impl_(new implementation(video_channel)){}\r

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index b4cb64cc8bc5ad07db754f03840629f53005918c..59a059baf30482f173afe04a8cbafbe8e03ce623 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -566,7 +566,7 @@ bool LoadbgCommand::DoExecute()
        for(size_t n = 0; n < _parameters.size(); ++n)\r
                message += _parameters[n] + L" ";\r
                \r
-       static const boost::wregex expr(L".*(?<TRANSITION>CUT|PUSH|SLIDE|WIPE)\\s*(?<DURATION>\\d+)\\s*(?<TWEEN>(LINEAR)|(EASE[^\\s]*))?\\s*(?<DIRECTION>FROMLEFT|FROMRIGHT|LEFT|RIGHT)?.*");\r
+       static const boost::wregex expr(L".*(?<TRANSITION>CUT|PUSH|SLIDE|WIPE|MIX)\\s*(?<DURATION>\\d+)\\s*(?<TWEEN>(LINEAR)|(EASE[^\\s]*))?\\s*(?<DIRECTION>FROMLEFT|FROMRIGHT|LEFT|RIGHT)?.*");\r
        boost::wsmatch what;\r
        if(boost::regex_match(message, what, expr))\r
        {\r