]> git.sesse.net Git - casparcg/blobdiff - shell/main.cpp
2.1.0: -casparcg.config: Updated.
[casparcg] / shell / main.cpp
index aa915c8aad8acb3b3542f639577d70d84bff94c8..aabc6ab9b867c8adf24287c87154765315e25c68 100644 (file)
@@ -124,25 +124,25 @@ void print_info()
        CASPAR_LOG(info) << L"Copyright (c) 2010 Sveriges Television AB, www.casparcg.com, <info@casparcg.com>";\r
        CASPAR_LOG(info) << L"################################################################################";\r
        CASPAR_LOG(info) << L"Starting CasparCG Video and Graphics Playout Server " << env::version();\r
-       CASPAR_LOG(info) << L"on " << get_win_product_name() << L" " << get_win_sp_version();\r
-       CASPAR_LOG(info) << get_cpu_info();\r
-       CASPAR_LOG(info) << get_system_product_name();\r
+       CASPAR_LOG(info) << L"on " << win_product_name() << L" " << win_sp_version();\r
+       CASPAR_LOG(info) << cpu_info();\r
+       CASPAR_LOG(info) << system_product_name();\r
        \r
-       CASPAR_LOG(info) << L"Decklink " << decklink::get_version();\r
-       BOOST_FOREACH(auto device, decklink::get_device_list())\r
+       CASPAR_LOG(info) << L"Decklink " << decklink::version();\r
+       BOOST_FOREACH(auto device, decklink::device_list())\r
                CASPAR_LOG(info) << L" - " << device;   \r
                \r
-       CASPAR_LOG(info) << L"Bluefish " << bluefish::get_version();\r
-       BOOST_FOREACH(auto device, bluefish::get_device_list())\r
+       CASPAR_LOG(info) << L"Bluefish " << bluefish::version();\r
+       BOOST_FOREACH(auto device, bluefish::device_list())\r
                CASPAR_LOG(info) << L" - " << device;   \r
        \r
-       CASPAR_LOG(info) << L"Flash "                   << flash::get_version();\r
-       CASPAR_LOG(info) << L"FreeImage "               << image::get_version();\r
-       CASPAR_LOG(info) << L"FFMPEG-avcodec "  << ffmpeg::get_avcodec_version();\r
-       CASPAR_LOG(info) << L"FFMPEG-avformat " << ffmpeg::get_avformat_version();\r
-       CASPAR_LOG(info) << L"FFMPEG-avfilter " << ffmpeg::get_avfilter_version();\r
-       CASPAR_LOG(info) << L"FFMPEG-avutil "   << ffmpeg::get_avutil_version();\r
-       CASPAR_LOG(info) << L"FFMPEG-swscale "  << ffmpeg::get_swscale_version();\r
+       CASPAR_LOG(info) << L"Flash "                   << flash::version();\r
+       CASPAR_LOG(info) << L"FreeImage "               << image::version();\r
+       CASPAR_LOG(info) << L"FFMPEG-avcodec "  << ffmpeg::avcodec_version();\r
+       CASPAR_LOG(info) << L"FFMPEG-avformat " << ffmpeg::avformat_version();\r
+       CASPAR_LOG(info) << L"FFMPEG-avfilter " << ffmpeg::avfilter_version();\r
+       CASPAR_LOG(info) << L"FFMPEG-avutil "   << ffmpeg::avutil_version();\r
+       CASPAR_LOG(info) << L"FFMPEG-swscale "  << ffmpeg::swscale_version();\r
 }\r
 \r
 LONG WINAPI UserUnhandledExceptionFilter(EXCEPTION_POINTERS* info)\r
@@ -161,6 +161,110 @@ LONG WINAPI UserUnhandledExceptionFilter(EXCEPTION_POINTERS* info)
     return EXCEPTION_EXECUTE_HANDLER;\r
 }\r
 \r
+void run()\r
+{\r
+       // Create server object which initializes channels, protocols and controllers.\r
+       server caspar_server;\r
+                               \r
+       auto server = spl::make_shared<protocol::osc::server>(5253);\r
+       caspar_server.subscribe(server);\r
+                                               \r
+       //auto console_obs = reactive::make_observer([](const monitor::event& e)\r
+       //{\r
+       //      std::stringstream str;\r
+       //      str << e;\r
+       //      CASPAR_LOG(trace) << str.str().c_str();\r
+       //});\r
+\r
+       //caspar_server.subscribe(console_obs);\r
+                                               \r
+       // Create a amcp parser for console commands.\r
+       protocol::amcp::AMCPProtocolStrategy amcp(caspar_server.channels());\r
+\r
+       // Create a dummy client which prints amcp responses to console.\r
+       auto console_client = std::make_shared<IO::ConsoleClientInfo>();\r
+                       \r
+       std::wstring wcmd;\r
+       while(true)\r
+       {\r
+               std::getline(std::wcin, wcmd); // TODO: It's blocking...\r
+                               \r
+               boost::to_upper(wcmd);\r
+\r
+               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
+               {\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"7")\r
+               {\r
+                       wcmd = L"";\r
+                       wcmd += L"CLEAR 1\r\n";\r
+                       wcmd += L"MIXER 1 CLEAR\r\n";\r
+                       wcmd += L"PLAY 1-0 GREEN\r\n";\r
+                       wcmd += L"PLAY 1-1 BLUE\r\n";\r
+                       wcmd += L"CG 1-2 ADD 1 ECS_TEST 1\r\n";\r
+                       wcmd += L"MIXER 1-2 FILL 0 -1 1 2\r\n";\r
+               }\r
+               else if(wcmd.substr(0, 1) == L"8")\r
+               {\r
+                       wcmd = L"";\r
+                       wcmd += L"MIXER 1-1 FILL 0.0 0.5 1.0 1.0 500 linear DEFER\r\n";\r
+                       wcmd += L"MIXER 1-2 FILL 0.0 0.0 1.0 1.0 500 linear DEFER\r\n";\r
+                       wcmd += L"MIXER 1 COMMIT\r\n";\r
+               }\r
+               else if(wcmd.substr(0, 1) == L"X")\r
+               {\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"\r\n";\r
+               amcp.Parse(wcmd.c_str(), static_cast<int>(wcmd.length()), console_client);\r
+       }       \r
+       CASPAR_LOG(info) << "Successfully shutdown CasparCG Server.";\r
+}\r
+\r
 int main(int argc, wchar_t* argv[])\r
 {      \r
        SetUnhandledExceptionFilter(UserUnhandledExceptionFilter);\r
@@ -234,110 +338,9 @@ int main(int argc, wchar_t* argv[])
                boost::property_tree::xml_writer_settings<wchar_t> w(' ', 3);\r
                boost::property_tree::write_xml(str, env::properties(), w);\r
                CASPAR_LOG(info) << L"casparcg.config:\n-----------------------------------------\n" << str.str().c_str() << L"-----------------------------------------";\r
-                               \r
-               {\r
-                       // Create server object which initializes channels, protocols and controllers.\r
-                       server caspar_server;\r
-                               \r
-                       auto server = spl::make_shared<protocol::osc::server>(5253);\r
-                       caspar_server.subscribe(server);\r
-                                               \r
-                       //auto console_obs = reactive::make_observer([](const monitor::event& e)\r
-                       //{\r
-                       //      std::stringstream str;\r
-                       //      str << e;\r
-                       //      CASPAR_LOG(trace) << str.str().c_str();\r
-                       //});\r
-\r
-                       //caspar_server.subscribe(console_obs);\r
-                                               \r
-                       // Create a amcp parser for console commands.\r
-                       protocol::amcp::AMCPProtocolStrategy amcp(caspar_server.get_channels());\r
-\r
-                       // Create a dummy client which prints amcp responses to console.\r
-                       auto console_client = std::make_shared<IO::ConsoleClientInfo>();\r
-                       \r
-                       std::wstring wcmd;\r
-                       while(true)\r
-                       {\r
-                               std::getline(std::wcin, wcmd); // TODO: It's blocking...\r
-                               \r
-                               boost::to_upper(wcmd);\r
-\r
-                               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
-                               {\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"7")\r
-                               {\r
-                                       wcmd = L"";\r
-                                       wcmd += L"CLEAR 1\r\n";\r
-                                       wcmd += L"MIXER 1 CLEAR\r\n";\r
-                                       wcmd += L"PLAY 1-0 GREEN\r\n";\r
-                                       wcmd += L"PLAY 1-1 BLUE\r\n";\r
-                                       wcmd += L"CG 1-2 ADD 1 ECS_TEST 1\r\n";\r
-                                       wcmd += L"MIXER 1-2 FILL 0 -1 1 2\r\n";\r
-                               }\r
-                               else if(wcmd.substr(0, 1) == L"8")\r
-                               {\r
-                                       wcmd = L"";\r
-                                       wcmd += L"MIXER 1-1 FILL 0.0 0.5 1.0 1.0 500 linear DEFER\r\n";\r
-                                       wcmd += L"MIXER 1-2 FILL 0.0 0.0 1.0 1.0 500 linear DEFER\r\n";\r
-                                       wcmd += L"MIXER 1 COMMIT\r\n";\r
-                               }\r
-                               else if(wcmd.substr(0, 1) == L"X")\r
-                               {\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"\r\n";\r
-                               amcp.Parse(wcmd.c_str(), static_cast<int>(wcmd.length()), console_client);\r
-                       }       \r
-               }\r
-               Sleep(500);\r
-               CASPAR_LOG(info) << "Successfully shutdown CasparCG Server.";\r
+               \r
+               run();\r
+               \r
                system("pause");        \r
        }\r
        catch(boost::property_tree::file_parser_error&)\r