* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
*\r
*/\r
-#include "resource.h"\r
-\r
-#include "server.h"\r
\r
// tbbmalloc_proxy: \r
// Replace the standard memory allocation routines in Microsoft* C/C++ RTL \r
// (malloc/free, global new/delete, etc.) with the TBB memory allocator. \r
#include <tbb/tbbmalloc_proxy.h>\r
\r
+#include "resource.h"\r
+\r
+#include "server.h"\r
+\r
#ifdef _DEBUG\r
#define _CRTDBG_MAP_ALLOC\r
#include <stdlib.h>\r
\r
#include <core/mixer/gpu/ogl_device.h>\r
\r
+#include <tbb/task_scheduler_init.h>\r
#include <tbb/task_scheduler_observer.h>\r
\r
#include <boost/property_tree/detail/file_parser_error.hpp>\r
\r
LONG WINAPI UserUnhandledExceptionFilter(EXCEPTION_POINTERS* info)\r
{\r
- CASPAR_LOG(fatal) << L"#######################\n UNHANDLED EXCEPTION: \n" \r
- << L"Adress:" << info->ExceptionRecord->ExceptionAddress << L"\n"\r
- << L"Code:" << info->ExceptionRecord->ExceptionCode << L"\n"\r
- << L"Flag:" << info->ExceptionRecord->ExceptionFlags << L"\n"\r
- << L"Info:" << info->ExceptionRecord->ExceptionInformation << L"\n"\r
- << L"Continuing execution. \n#######################";\r
+ try\r
+ {\r
+ CASPAR_LOG(fatal) << L"#######################\n UNHANDLED EXCEPTION: \n" \r
+ << L"Adress:" << info->ExceptionRecord->ExceptionAddress << L"\n"\r
+ << L"Code:" << info->ExceptionRecord->ExceptionCode << L"\n"\r
+ << L"Flag:" << info->ExceptionRecord->ExceptionFlags << L"\n"\r
+ << L"Info:" << info->ExceptionRecord->ExceptionInformation << L"\n"\r
+ << L"Continuing execution. \n#######################";\r
+ }\r
+ catch(...){}\r
\r
return EXCEPTION_CONTINUE_EXECUTION;\r
}\r
SetUnhandledExceptionFilter(UserUnhandledExceptionFilter);\r
\r
CASPAR_LOG(info) << L"Type \"q\" to close application";\r
-\r
- CASPAR_LOG(info) << L"THIS IS AN ALPHA BUILD";\r
-\r
+ \r
// Set debug mode.\r
#ifdef _DEBUG\r
_CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF | _CRTDBG_CHECK_ALWAYS_DF );\r
caspar::win32_exception::install_handler();\r
}\r
} tbb_thread_installer;\r
+\r
+ tbb::task_scheduler_init init;\r
\r
try \r
{\r
n++;\r
}\r
\r
- wcmd = L"MIXER 1 VIDEO GRID " + boost::lexical_cast<std::wstring>(n);\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