3606130: testing code (command line only, not via AMCP over TCP) could cause entire...

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

diff --git a/shell/main.cpp b/shell/main.cpp
index 209938ea456dba8f92509555469a77f33ac66581..1d2ab27a3730a688745168a1f160d87bf79ca13e 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -272,52 +272,60 @@ int main(int argc, wchar_t* argv[])
                                if(wcmd == L"EXIT" || wcmd == L"Q" || wcmd == L"QUIT" || wcmd == L"BYE")\r
                                        break;\r
                                \r
-                               // This is just dummy code for testing.\r
-                               if(wcmd.substr(0, 1) == L"1")\r
-                                       wcmd = L"LOADBG 1-1 " + wcmd.substr(1, wcmd.length()-1) + L" SLIDE 100 LOOP \r\nPLAY 1-1";\r
-                               else if(wcmd.substr(0, 1) == L"2")\r
-                                       wcmd = L"MIXER 1-0 VIDEO IS_KEY 1";\r
-                               else if(wcmd.substr(0, 1) == L"3")\r
-                                       wcmd = L"CG 1-2 ADD 1 BBTELEFONARE 1";\r
-                               else if(wcmd.substr(0, 1) == L"4")\r
-                                       wcmd = L"PLAY 1-1 DV FILTER yadif=1:-1 LOOP";\r
-                               else if(wcmd.substr(0, 1) == L"5")\r
+                               try\r
                                {\r
-                                       auto file = wcmd.substr(2, wcmd.length()-1);\r
-                                       wcmd = L"PLAY 1-1 " + file + L" LOOP\r\n" \r
-                                                       L"PLAY 1-2 " + file + L" LOOP\r\n" \r
-                                                       L"PLAY 1-3 " + file + L" LOOP\r\n"\r
-                                                       L"PLAY 2-1 " + file + L" LOOP\r\n" \r
-                                                       L"PLAY 2-2 " + file + L" LOOP\r\n" \r
-                                                       L"PLAY 2-3 " + file + L" LOOP\r\n";\r
-                               }\r
-                               else if(wcmd.substr(0, 1) == L"X")\r
-                               {\r
-                                       int num = 0;\r
-                                       std::wstring file;\r
-                                       try\r
+                                       // This is just dummy code for testing.\r
+                                       if(wcmd.substr(0, 1) == L"1")\r
+                                               wcmd = L"LOADBG 1-1 " + wcmd.substr(1, wcmd.length()-1) + L" SLIDE 100 LOOP \r\nPLAY 1-1";\r
+                                       else if(wcmd.substr(0, 1) == L"2")\r
+                                               wcmd = L"MIXER 1-0 VIDEO IS_KEY 1";\r
+                                       else if(wcmd.substr(0, 1) == L"3")\r
+                                               wcmd = L"CG 1-2 ADD 1 BBTELEFONARE 1";\r
+                                       else if(wcmd.substr(0, 1) == L"4")\r
+                                               wcmd = L"PLAY 1-1 DV FILTER yadif=1:-1 LOOP";\r
+                                       else if(wcmd.substr(0, 1) == L"5")\r
                                        {\r
-                                               num = boost::lexical_cast<int>(wcmd.substr(1, 2));\r
-                                               file = wcmd.substr(4, wcmd.length()-1);\r
+                                               auto file = wcmd.substr(2, wcmd.length()-1);\r
+                                               wcmd = L"PLAY 1-1 " + file + L" LOOP\r\n" \r
+                                                               L"PLAY 1-2 " + file + L" LOOP\r\n" \r
+                                                               L"PLAY 1-3 " + file + L" LOOP\r\n"\r
+                                                               L"PLAY 2-1 " + file + L" LOOP\r\n" \r
+                                                               L"PLAY 2-2 " + file + L" LOOP\r\n" \r
+                                                               L"PLAY 2-3 " + file + L" LOOP\r\n";\r
                                        }\r
-                                       catch(...)\r
-                                       {\r
-                                               num = boost::lexical_cast<int>(wcmd.substr(1, 1));\r
-                                               file = wcmd.substr(3, wcmd.length()-1);\r
-                                       }\r
-\r
-                                       int n = 0;\r
-                                       int num2 = num;\r
-                                       while(num2 > 0)\r
+                                       else if(wcmd.substr(0, 1) == L"X")\r
                                        {\r
-                                               num2 >>= 1;\r
-                                               n++;\r
+                                               int num = 0;\r
+                                               std::wstring file;\r
+                                               try\r
+                                               {\r
+                                                       num = boost::lexical_cast<int>(wcmd.substr(1, 2));\r
+                                                       file = wcmd.substr(4, wcmd.length()-1);\r
+                                               }\r
+                                               catch(...)\r
+                                               {\r
+                                                       num = boost::lexical_cast<int>(wcmd.substr(1, 1));\r
+                                                       file = wcmd.substr(3, wcmd.length()-1);\r
+                                               }\r
+\r
+                                               int n = 0;\r
+                                               int num2 = num;\r
+                                               while(num2 > 0)\r
+                                               {\r
+                                                       num2 >>= 1;\r
+                                                       n++;\r
+                                               }\r
+\r
+                                               wcmd = L"MIXER 1 GRID " + boost::lexical_cast<std::wstring>(n);\r
+\r
+                                               for(int i = 1; i <= num; ++i)\r
+                                                       wcmd += L"\r\nPLAY 1-" + boost::lexical_cast<std::wstring>(i) + L" " + file + L" LOOP";// + L" SLIDE 100 LOOP";\r
                                        }\r
-\r
-                                       wcmd = L"MIXER 1 GRID " + boost::lexical_cast<std::wstring>(n);\r
-\r
-                                       for(int i = 1; i <= num; ++i)\r
-                                               wcmd += L"\r\nPLAY 1-" + boost::lexical_cast<std::wstring>(i) + L" " + file + L" LOOP";// + L" SLIDE 100 LOOP";\r
+                               }\r
+                               catch (...)\r
+                               {\r
+                                       CASPAR_LOG_CURRENT_EXCEPTION();\r
+                                       continue;\r
                                }\r
 \r
                                wcmd += L"\r\n";\r