]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 13 Nov 2011 18:38:21 +0000 (18:38 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 13 Nov 2011 18:38:21 +0000 (18:38 +0000)
shell/main.cpp

index 3761c41fe0f166be0394fd772a4a6931fa92b012..caa1b27a2deaf4c7b0e0172bc41f88a290348c9c 100644 (file)
@@ -210,91 +210,92 @@ int main(int argc, wchar_t* argv[])
        \r
        try \r
        {\r
-               // Configure environment properties from configuration.\r
-               caspar::env::configure("casparcg.config");\r
+               {\r
+                       // Configure environment properties from configuration.\r
+                       caspar::env::configure("casparcg.config");\r
 \r
-       #ifdef _DEBUG\r
-               if(caspar::env::properties().get("configuration.debugging.remote", false))\r
-                       MessageBox(nullptr, TEXT("Now is the time to connect for remote debugging..."), TEXT("Debug"), MB_OK | MB_TOPMOST);\r
-       #endif   \r
+               #ifdef _DEBUG\r
+                       if(caspar::env::properties().get("configuration.debugging.remote", false))\r
+                               MessageBox(nullptr, TEXT("Now is the time to connect for remote debugging..."), TEXT("Debug"), MB_OK | MB_TOPMOST);\r
+               #endif   \r
 \r
-               // Start logging to file.\r
-               caspar::log::add_file_sink(caspar::env::log_folder());\r
+                       // Start logging to file.\r
+                       caspar::log::add_file_sink(caspar::env::log_folder());\r
                \r
-               // Setup console window.\r
-               setup_console_window();\r
+                       // Setup console window.\r
+                       setup_console_window();\r
 \r
-               // Print environment information.\r
-               print_info();\r
+                       // Print environment information.\r
+                       print_info();\r
                                \r
-               // Create server object which initializes channels, protocols and controllers.\r
-               caspar::server caspar_server;\r
+                       // Create server object which initializes channels, protocols and controllers.\r
+                       caspar::server caspar_server;\r
                                \r
-               // Create a amcp parser for console commands.\r
-               caspar::protocol::amcp::AMCPProtocolStrategy amcp(caspar_server.get_channels());\r
+                       // Create a amcp parser for console commands.\r
+                       caspar::protocol::amcp::AMCPProtocolStrategy amcp(caspar_server.get_channels());\r
 \r
-               // Create a dummy client which prints amcp responses to console.\r
-               auto dummy = std::make_shared<caspar::IO::ConsoleClientInfo>();\r
+                       // Create a dummy client which prints amcp responses to console.\r
+                       auto dummy = std::make_shared<caspar::IO::ConsoleClientInfo>();\r
 \r
-               bool is_running = true;\r
-               while(is_running)\r
-               {\r
-                       std::wstring wcmd;\r
-                       std::getline(std::wcin, wcmd); // TODO: It's blocking...\r
-\r
-                       is_running = wcmd != L"exit" && wcmd != L"q";\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
+                       bool is_running = true;\r
+                       while(is_running)\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
+                               std::wstring wcmd;\r
+                               std::getline(std::wcin, wcmd); // TODO: It's blocking...\r
+\r
+                               is_running = wcmd != L"exit" && wcmd != L"q";\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
+                               else if(wcmd.substr(0, 1) == L"X")\r
                                {\r
-                                       num = boost::lexical_cast<int>(wcmd.substr(1, 1));\r
-                                       file = wcmd.substr(3, wcmd.length()-1);\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
-                               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
+                               wcmd += L"\r\n";\r
+                               amcp.Parse(wcmd.c_str(), wcmd.length(), dummy);\r
                        }\r
-\r
-                       wcmd += L"\r\n";\r
-                       amcp.Parse(wcmd.c_str(), wcmd.length(), dummy);\r
                }\r
-               \r
-               Sleep(100); // CAPSAR_LOG is asynchronous. Try to get text in correct order.\r
+               Sleep(200); // CAPSAR_LOG is asynchronous. Try to get text in correct order.\r
                system("pause");\r
        }\r
        catch(boost::property_tree::file_parser_error&)\r