* 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
#endif\r
\r
#define NOMINMAX\r
+#define WIN32_LEAN_AND_MEAN\r
\r
#include <windows.h>\r
+#include <winnt.h>\r
+#include <mmsystem.h>\r
#include <atlbase.h>\r
\r
-#include <core/mixer/gpu/ogl_device.h>\r
-\r
#include <protocol/amcp/AMCPProtocolStrategy.h>\r
\r
#include <modules/bluefish/bluefish.h>\r
#include <common/gl/gl_check.h>\r
#include <common/os/windows/current_version.h>\r
#include <common/os/windows/system_info.h>\r
-#include <common/utility/assert.h>\r
\r
-#include <tbb/task_scheduler_observer.h>\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/foreach.hpp>\r
#include <boost/property_tree/detail/file_parser_error.hpp>\r
\r
+#include <algorithm>\r
+\r
// NOTE: This is needed in order to make CComObject work since this is not a real ATL project.\r
CComModule _AtlModule;\r
extern __declspec(selectany) CAtlModule* _pAtlModule = &_AtlModule;\r
CASPAR_LOG(info) << L"on " << caspar::get_win_product_name() << L" " << caspar::get_win_sp_version();\r
CASPAR_LOG(info) << caspar::get_cpu_info();\r
CASPAR_LOG(info) << caspar::get_system_product_name();\r
- CASPAR_LOG(info) << L"Flash " << caspar::get_flash_version();\r
- CASPAR_LOG(info) << L"Flash-Template-Host " << caspar::get_cg_version();\r
- CASPAR_LOG(info) << L"FreeImage " << caspar::get_image_version();\r
+ CASPAR_LOG(info) << L"Flash " << caspar::flash::get_version();\r
+ CASPAR_LOG(info) << L"Flash-Template-Host " << caspar::flash::get_cg_version();\r
+ CASPAR_LOG(info) << L"FreeImage " << caspar::image::get_version();\r
\r
- CASPAR_LOG(info) << L"Decklink " << caspar::get_decklink_version();\r
- BOOST_FOREACH(auto& device, caspar::get_decklink_device_list())\r
+ CASPAR_LOG(info) << L"Decklink " << caspar::decklink::get_version();\r
+ auto deck = caspar::decklink::get_device_list();\r
+ std::for_each(deck.begin(), deck.end(), [](const std::wstring& device)\r
+ {\r
CASPAR_LOG(info) << device;\r
+ });\r
\r
- CASPAR_LOG(info) << L"Bluefish " << caspar::get_bluefish_version();\r
- BOOST_FOREACH(auto& device, caspar::get_bluefish_device_list())\r
+ auto blue = caspar::bluefish::get_device_list();\r
+ std::for_each(blue.begin(), blue.end(), [](const std::wstring& device)\r
+ {\r
CASPAR_LOG(info) << device;\r
-\r
- CASPAR_LOG(info) << L"FFMPEG-avcodec " << caspar::get_avcodec_version();\r
- CASPAR_LOG(info) << L"FFMPEG-avformat " << caspar::get_avformat_version();\r
- CASPAR_LOG(info) << L"FFMPEG-avfilter " << caspar::get_avfilter_version();\r
- CASPAR_LOG(info) << L"FFMPEG-avutil " << caspar::get_avutil_version();\r
- CASPAR_LOG(info) << L"FFMPEG-swscale " << caspar::get_swscale_version();\r
+ });\r
+ \r
+ CASPAR_LOG(info) << L"FFMPEG-avcodec " << caspar::ffmpeg::get_avcodec_version();\r
+ CASPAR_LOG(info) << L"FFMPEG-avformat " << caspar::ffmpeg::get_avformat_version();\r
+ CASPAR_LOG(info) << L"FFMPEG-avfilter " << caspar::ffmpeg::get_avfilter_version();\r
+ CASPAR_LOG(info) << L"FFMPEG-avutil " << caspar::ffmpeg::get_avutil_version();\r
+ CASPAR_LOG(info) << L"FFMPEG-swscale " << caspar::ffmpeg::get_swscale_version();\r
CASPAR_LOG(info) << L"OpenGL " << caspar::core::ogl_device::get_version() << "\n\n";\r
}\r
- \r
+\r
+LONG WINAPI UserUnhandledExceptionFilter(EXCEPTION_POINTERS* info)\r
+{\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
+\r
int main(int argc, wchar_t* argv[])\r
{ \r
static_assert(sizeof(void*) == 4, "64-bit code generation is not supported.");\r
\r
- CASPAR_LOG(info) << L"Type \"q\" to close application";\r
-\r
- CASPAR_LOG(info) << L"THIS IS AN ALPHA BUILD";\r
+ SetUnhandledExceptionFilter(UserUnhandledExceptionFilter);\r
\r
+ CASPAR_LOG(info) << L"Type \"q\" to close application";\r
+ \r
// Set debug mode.\r
#ifdef _DEBUG\r
_CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF | _CRTDBG_CHECK_ALWAYS_DF );\r
\r
// Install structured exception handler.\r
caspar::win32_exception::install_handler();\r
+\r
+ caspar::log::set_log_level(L"debug");\r
\r
// Increase time precision. This will increase accuracy of function like Sleep(1) from 10 ms to 1 ms.\r
struct inc_prec\r
tbb_thread_installer(){observe(true);}\r
void on_scheduler_entry(bool is_worker)\r
{\r
- caspar::detail::SetThreadName(GetCurrentThreadId(), "tbb-worker-thread");\r
+ //caspar::detail::SetThreadName(GetCurrentThreadId(), "tbb-worker-thread");\r
caspar::win32_exception::install_handler();\r
}\r
} tbb_thread_installer;\r
+\r
+ tbb::task_scheduler_init init;\r
\r
try \r
{\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"X")\r
{\r
int num = 0;\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
catch(caspar::gl::ogl_exception&)\r
{\r
CASPAR_LOG_CURRENT_EXCEPTION();\r
-\r
CASPAR_LOG(fatal) << L"Unhandled OpenGL Error in main thread. Please try to update graphics drivers in order to receive full OpenGL 3.1+ Support.";\r
}\r
catch(...)\r
projects / casparcg / blobdiff