2.0.0.2: AMCP: Fixed parsing bugs.

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

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index d6620ffb015837fba398de7a070cd33b79e51d50..7ccaa5453892fc1100a2ee0b775c7104c0f14e78 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -219,8 +219,8 @@ bool MixerCommand::DoExecute()
                        }\r
                        else if(_parameters[1] == L"OPACITY")\r
                        {\r
-                               int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
-                               std::wstring tween = _parameters.size() > 3 ? _parameters[4] : L"linear";\r
+                               int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
+                               std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
 \r
                                double value = boost::lexical_cast<double>(_parameters.at(2));\r
                        \r
@@ -238,8 +238,8 @@ bool MixerCommand::DoExecute()
                        }\r
                        else if(_parameters[1] == L"GAIN")\r
                        {\r
-                               int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
-                               std::wstring tween = _parameters.size() > 3 ? _parameters[4] : L"linear";\r
+                               int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
+                               std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
                                double value = boost::lexical_cast<double>(_parameters.at(2));\r
                                \r
                                auto transform = [=](image_transform transform) -> image_transform\r
@@ -256,8 +256,8 @@ bool MixerCommand::DoExecute()
                        }\r
                        else if(_parameters[1] == L"FILL_RECT")\r
                        {\r
-                               int duration = _parameters.size() > 5 ? lexical_cast_or_default(_parameters[6], 0) : 0;\r
-                               std::wstring tween = _parameters.size() > 6 ? _parameters[7] : L"linear";\r
+                               int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0;\r
+                               std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear";\r
                                double x        = boost::lexical_cast<double>(_parameters.at(2));\r
                                double y        = boost::lexical_cast<double>(_parameters.at(3));\r
                                double x_s      = boost::lexical_cast<double>(_parameters.at(4));\r
@@ -280,8 +280,8 @@ bool MixerCommand::DoExecute()
                        }\r
                        else if(_parameters[1] == L"KEY_RECT")\r
                        {\r
-                               int duration = _parameters.size() > 5 ? lexical_cast_or_default(_parameters[6], 0) : 0;\r
-                               std::wstring tween = _parameters.size() > 6 ? _parameters[7] : L"linear";\r
+                               int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0;\r
+                               std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear";\r
                                double x        = boost::lexical_cast<double>(_parameters.at(2));\r
                                double y        = boost::lexical_cast<double>(_parameters.at(3));\r
                                double x_s      = boost::lexical_cast<double>(_parameters.at(4));\r
@@ -302,8 +302,8 @@ bool MixerCommand::DoExecute()
                        }\r
                        else if(_parameters[1] == L"GRID")\r
                        {\r
-                               int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
-                               std::wstring tween = _parameters.size() > 3 ? _parameters[4] : L"linear";\r
+                               int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
+                               std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
                                int n = boost::lexical_cast<int>(_parameters.at(2));\r
                                double delta = 1.0/static_cast<double>(n);\r
                                for(int x = 0; x < n; ++x)\r
@@ -325,8 +325,8 @@ bool MixerCommand::DoExecute()
                        }\r
                        else if(_parameters[1] == L"RESET")\r
                        {\r
-                               int duration = _parameters.size() > 1 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
-                               std::wstring tween = _parameters.size() > 2 ? _parameters[3] : L"linear";\r
+                               int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
+                               std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
 \r
                                int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
                                if(layer != std::numeric_limits<int>::min())\r
@@ -339,8 +339,8 @@ bool MixerCommand::DoExecute()
                {\r
                        if(_parameters[1] == L"GAIN")\r
                        {\r
-                               int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
-                               std::wstring tween = _parameters.size() > 3 ? _parameters[4] : L"linear";\r
+                               int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
+                               std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
                                double value = boost::lexical_cast<double>(_parameters[2]);\r
 \r
                                auto transform = [=](audio_transform transform) -> audio_transform\r
@@ -357,15 +357,15 @@ bool MixerCommand::DoExecute()
                        }\r
                        else if(_parameters[1] == L"RESET")\r
                        {\r
-                               int duration = _parameters.size() > 1 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
-                               std::wstring tween = _parameters.size() > 2 ? _parameters[3] : L"linear";\r
+                               int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
+                               std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
                                GetChannel()->mixer()->reset_audio_transform(duration, tween);\r
                        }\r
                }\r
                else if(_parameters[0] == L"RESET")\r
                {\r
-                       int duration = _parameters.size() > 1 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
-                       std::wstring tween = _parameters.size() > 2 ? _parameters[3] : L"linear";\r
+                       int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
+                       std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
                        GetChannel()->mixer()->reset_image_transform(duration, tween);\r
                        GetChannel()->mixer()->reset_audio_transform(duration, tween);\r
                }\r