return index < channels.size() ? std::shared_ptr<core::video_channel>(channels[index]) : nullptr;\r
}\r
\r
-AMCPProtocolStrategy::AMCPProtocolStrategy(const std::vector<safe_ptr<core::video_channel>>& channels, const std::shared_ptr<core::thumbnail_generator>& thumb_gen)\r
- : channels_(channels)\r
- , thumb_gen_(thumb_gen) {\r
+AMCPProtocolStrategy::AMCPProtocolStrategy(\r
+ const std::vector<safe_ptr<core::video_channel>>& channels,\r
+ const std::shared_ptr<core::thumbnail_generator>& thumb_gen,\r
+ boost::promise<bool>& shutdown_server_now)\r
+ : channels_(channels)\r
+ , thumb_gen_(thumb_gen)\r
+ , shutdown_server_now_(shutdown_server_now)\r
+{\r
AMCPCommandQueuePtr pGeneralCommandQueue(new AMCPCommandQueue());\r
commandQueues_.push_back(pGeneralCommandQueue);\r
\r
{\r
pCommand->SetChannels(channels_);\r
pCommand->SetThumbGenerator(thumb_gen_);\r
+ pCommand->SetShutdownServerNow(shutdown_server_now_);\r
//Set scheduling\r
if(commandSwitch.size() > 0) {\r
transform(commandSwitch.begin(), commandSwitch.end(), commandSwitch.begin(), toupper);\r
//{\r
// result = AMCPCommandPtr(new MonitorCommand());\r
//}\r
- //else if(s == TEXT("KILL"))\r
- //{\r
- // result = AMCPCommandPtr(new KillCommand());\r
- //}\r
+ else if(s == TEXT("KILL")) return std::make_shared<KillCommand>();\r
return nullptr;\r
}\r
\r
#include <boost/property_tree/detail/file_parser_error.hpp>\r
#include <boost/property_tree/xml_parser.hpp>\r
#include <boost/foreach.hpp>\r
+#include <boost/thread.hpp>\r
+#include <boost/thread/future.hpp>\r
#include <boost/locale.hpp>\r
+#include <boost/algorithm/string/case_conv.hpp>\r
\r
// NOTE: This is needed in order to make CComObject work since this is not a real ATL project.\r
CComModule _AtlModule;\r
return EXCEPTION_EXECUTE_HANDLER;\r
}\r
\r
+void make_upper_case(std::wstring& str)\r
+{\r
+ boost::to_upper(str);\r
+}\r
+\r
int main(int argc, wchar_t* argv[])\r
{ \r
static_assert(sizeof(void*) == 4, "64-bit code generation is not supported.");\r
boost::property_tree::xml_writer_settings<wchar_t> w(' ', 3);\r
boost::property_tree::write_xml(str, caspar::env::properties(), w);\r
CASPAR_LOG(info) << L"casparcg.config:\n-----------------------------------------\n" << str.str().c_str() << L"-----------------------------------------";\r
- \r
+ bool wait_for_keypress;\r
+\r
{\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(), caspar_server.get_thumbnail_generator());\r
+ boost::promise<bool> shutdown_server_now;\r
+ boost::unique_future<bool> shutdown_server = shutdown_server_now.get_future();\r
\r
- // Create a dummy client which prints amcp responses to console.\r
- auto console_client = std::make_shared<caspar::IO::ConsoleClientInfo>();\r
+ // Create server object which initializes channels, protocols and controllers.\r
+ caspar::server caspar_server(shutdown_server_now);\r
\r
- std::wstring wcmd;\r
- while(true)\r
+ // Use separate thread for the blocking console input, will be terminated \r
+ // anyway when the main thread terminates.\r
+ boost::thread stdin_thread([&caspar_server, &shutdown_server_now]\r
{\r
- std::getline(std::wcin, wcmd); // TODO: It's blocking...\r
+ // Create a amcp parser for console commands.\r
+ caspar::protocol::amcp::AMCPProtocolStrategy amcp(\r
+ caspar_server.get_channels(),\r
+ caspar_server.get_thumbnail_generator(),\r
+ shutdown_server_now);\r
+\r
+ // Create a dummy client which prints amcp responses to console.\r
+ auto console_client = std::make_shared<caspar::IO::ConsoleClientInfo>();\r
+ std::wstring wcmd;\r
+ \r
+ while(true)\r
+ {\r
+ std::getline(std::wcin, wcmd); // TODO: It's blocking...\r
\r
- boost::to_upper(wcmd);\r
+ //boost::to_upper(wcmd); // TODO COMPILER crashes on this line, Strange!\r
+ make_upper_case(wcmd);\r
\r
- if(wcmd == L"EXIT" || wcmd == L"Q" || wcmd == L"QUIT" || wcmd == L"BYE")\r
- break;\r
- \r
- try\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
+ if(wcmd == L"EXIT" || wcmd == L"Q" || wcmd == L"QUIT" || wcmd == L"BYE")\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
+ shutdown_server_now.set_value(true); // True to wait for keypress\r
+ break;\r
}\r
- else if(wcmd.substr(0, 1) == L"X")\r
+ \r
+ try\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
+ // 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, 1));\r
- file = wcmd.substr(3, 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
-\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
- }\r
- catch (...)\r
- {\r
- CASPAR_LOG_CURRENT_EXCEPTION();\r
- continue;\r
- }\r
+ catch (...)\r
+ {\r
+ CASPAR_LOG_CURRENT_EXCEPTION();\r
+ continue;\r
+ }\r
\r
- wcmd += L"\r\n";\r
- amcp.Parse(wcmd.c_str(), wcmd.length(), console_client);\r
- } \r
+ wcmd += L"\r\n";\r
+ amcp.Parse(wcmd.c_str(), wcmd.length(), console_client);\r
+ } \r
+ });\r
+ stdin_thread.detach();\r
+ wait_for_keypress = shutdown_server.get();\r
}\r
Sleep(500);\r
CASPAR_LOG(info) << "Successfully shutdown CasparCG Server.";\r
- system("pause"); \r
+\r
+ if (wait_for_keypress)\r
+ system("pause"); \r
}\r
catch(boost::property_tree::file_parser_error&)\r
{\r
\r
struct server::implementation : boost::noncopyable\r
{\r
+ boost::promise<bool>& shutdown_server_now_;\r
safe_ptr<ogl_device> ogl_;\r
std::vector<safe_ptr<IO::AsyncEventServer>> async_servers_; \r
std::vector<safe_ptr<video_channel>> channels_;\r
std::shared_ptr<thumbnail_generator> thumbnail_generator_;\r
\r
- implementation() \r
- : ogl_(ogl_device::create())\r
+ implementation(boost::promise<bool>& shutdown_server_now)\r
+ : shutdown_server_now_(shutdown_server_now)\r
+ , ogl_(ogl_device::create())\r
{ \r
ffmpeg::init();\r
CASPAR_LOG(info) << L"Initialized ffmpeg module.";\r
safe_ptr<IO::IProtocolStrategy> create_protocol(const std::wstring& name) const\r
{\r
if(boost::iequals(name, L"AMCP"))\r
- return make_safe<amcp::AMCPProtocolStrategy>(channels_, thumbnail_generator_);\r
+ return make_safe<amcp::AMCPProtocolStrategy>(channels_, thumbnail_generator_, shutdown_server_now_);\r
else if(boost::iequals(name, L"CII"))\r
return make_safe<cii::CIIProtocolStrategy>(channels_);\r
else if(boost::iequals(name, L"CLOCK"))\r
}\r
};\r
\r
-server::server() : impl_(new implementation()){}\r
+server::server(boost::promise<bool>& shutdown_server_now) : impl_(new implementation(shutdown_server_now)){}\r
\r
const std::vector<safe_ptr<video_channel>> server::get_channels() const\r
{\r
projects / casparcg / commitdiff