* Author: Robert Nagy, ronag89@gmail.com
*/
-// tbbmalloc_proxy:
-// Replace the standard memory allocation routines in Microsoft* C/C++ RTL
-// (malloc/free, global new/delete, etc.) with the TBB memory allocator.
+// tbbmalloc_proxy:
+// Replace the standard memory allocation routines in Microsoft* C/C++ RTL
+// (malloc/free, global new/delete, etc.) with the TBB memory allocator.
#include "stdafx.h"
#include <set>
#include <csignal>
+#include <clocale>
using namespace caspar;
-
+
void setup_global_locale()
{
boost::locale::generator gen;
gen.categories(boost::locale::codepage_facet);
std::locale::global(gen(""));
+
+ // sscanf is used in for example FFmpeg where we want decimals to be parsed as .
+ std::setlocale(LC_ALL, "C");
}
void print_info()
while(true)
{
std::getline(std::wcin, wcmd); // TODO: It's blocking...
-
+
//boost::to_upper(wcmd);
if(boost::iequals(wcmd, L"EXIT") || boost::iequals(wcmd, L"Q") || boost::iequals(wcmd, L"QUIT") || boost::iequals(wcmd, L"BYE"))
{
+ CASPAR_LOG(info) << L"Received message from Console: " << wcmd << L"\\r\\n";
should_wait_for_keypress = true;
shutdown_server_now.set_value(false); //false to not restart
break;
else if(wcmd.substr(0, 1) == L"5")
{
auto file = wcmd.substr(2, wcmd.length()-1);
- wcmd = L"PLAY 1-1 " + file + L" LOOP\r\n"
- L"PLAY 1-2 " + file + L" LOOP\r\n"
+ wcmd = L"PLAY 1-1 " + file + L" LOOP\r\n"
+ L"PLAY 1-2 " + file + L" LOOP\r\n"
L"PLAY 1-3 " + file + L" LOOP\r\n"
- L"PLAY 2-1 " + file + L" LOOP\r\n"
- L"PLAY 2-2 " + file + L" LOOP\r\n"
+ L"PLAY 2-1 " + file + L" LOOP\r\n"
+ L"PLAY 2-2 " + file + L" LOOP\r\n"
L"PLAY 2-3 " + file + L" LOOP\r\n";
}
else if(wcmd.substr(0, 1) == L"7")
// Create server object which initializes channels, protocols and controllers.
std::unique_ptr<server> caspar_server(new server(shutdown_server_now));
+ // For example CEF resets the global locale, so this is to reset it back to "our" preference.
+ setup_global_locale();
+
// Print environment information.
print_system_info(caspar_server->get_system_info_provider_repo());
boost::property_tree::xml_writer_settings<std::wstring> w(' ', 3);
boost::property_tree::write_xml(str, env::properties(), w);
CASPAR_LOG(info) << config_file_name << L":\n-----------------------------------------\n" << str.str() << L"-----------------------------------------";
-
+
{
CASPAR_SCOPED_CONTEXT_MSG(config_file_name + L": ")
caspar_server->start();
caspar_server->get_amcp_command_repository())))->create(console_client);
std::weak_ptr<IO::protocol_strategy<wchar_t>> weak_amcp = amcp;
- // Use separate thread for the blocking console input, will be terminated
+ // Use separate thread for the blocking console input, will be terminated
// anyway when the main thread terminates.
boost::thread stdin_thread(std::bind(do_run, weak_amcp, std::ref(shutdown_server_now), std::ref(should_wait_for_keypress))); //compiler didn't like lambda here...
stdin_thread.detach();
setup_global_locale();
std::wcout << L"Type \"q\" to close application." << std::endl;
-
+
// Set debug mode.
auto debugging_environment = setup_debugging_environment();
tbb::task_scheduler_init init;
std::wstring config_file_name(L"casparcg.config");
-
- try
+
+ try
{
// Configure environment properties from configuration.
if (argc >= 2)
log::add_file_sink(env::log_folder() + L"caspar", caspar::log::category != caspar::log::log_category::calltrace);
log::add_file_sink(env::log_folder() + L"calltrace", caspar::log::category == caspar::log::log_category::calltrace);
std::wcout << L"Logging [info] or higher severity to " << env::log_folder() << std::endl << std::endl;
-
+
+ // Once logging to file, log configuration warnings.
+ env::log_configuration_warnings();
+
// Setup console window.
setup_console_window();
if (thread->name != "main thread" && thread->name != "tbb-worker-thread")
CASPAR_LOG(warning) << L"Thread left running: " << thread->name << L" (" << thread->native_id << L")";
}
-
+
CASPAR_LOG(info) << "Successfully shutdown CasparCG Server.";
- if (!should_wait_for_keypress)
+ if (should_wait_for_keypress)
wait_for_keypress();
}
catch(const boost::property_tree::file_parser_error& e)
{
- CASPAR_LOG_CURRENT_EXCEPTION();
CASPAR_LOG(fatal) << "At " << u8(config_file_name) << ":" << e.line() << ": " << e.message() << ". Please check the configuration file (" << u8(config_file_name) << ") for errors.";
wait_for_keypress();
}
catch (const user_error& e)
{
- CASPAR_LOG_CURRENT_EXCEPTION_AT_LEVEL(debug);
- CASPAR_LOG(fatal) << get_message_and_context(e) << " Please check the configuration file (" << u8(config_file_name) << ") for errors. Turn on log level debug for stacktrace.";
+ CASPAR_LOG(fatal) << get_message_and_context(e) << " Please check the configuration file (" << u8(config_file_name) << ") for errors.";
wait_for_keypress();
}
catch(...)
projects / casparcg / blobdiff