Moved framerate calculation from CLS/CINF to thumbnail generation time for each file...

[casparcg] / shell / main.cpp

diff --git a/shell/main.cpp b/shell/main.cpp
index 36721b83ee0809879773d68456849a0369b16f13..f7cd96ca9df6c907191e3811196b08bffc59288f 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -52,6 +52,7 @@
 #include <modules/flash/flash.h>\r
 #include <modules/ffmpeg/ffmpeg.h>\r
 #include <modules/image/image.h>\r
+#include <modules/newtek/util/air_send.h>\r
 \r
 #include <common/env.h>\r
 #include <common/exception/win32_exception.h>\r
@@ -159,6 +160,7 @@ void print_info()
        CASPAR_LOG(info) << L"FFMPEG-swscale "  << caspar::ffmpeg::get_swscale_version();\r
        CASPAR_LOG(info) << L"Flash "                   << caspar::flash::get_version();\r
        CASPAR_LOG(info) << L"Template-Host "   << caspar::flash::get_cg_version();\r
+       CASPAR_LOG(info) << L"NewTek iVGA "             << (caspar::newtek::airsend::is_available() ? L"available" : L"unavailable (" + caspar::newtek::airsend::dll_name() + L")");\r
 }\r
 \r
 LONG WINAPI UserUnhandledExceptionFilter(EXCEPTION_POINTERS* info)\r
@@ -211,7 +213,7 @@ int main(int argc, wchar_t* argv[])
        SetPriorityClass(GetCurrentProcess(), ABOVE_NORMAL_PRIORITY_CLASS);\r
 \r
        // Install structured exception handler.\r
-       caspar::win32_exception::install_handler();\r
+       caspar::win32_exception::ensure_handler_installed_for_thread("main-thread");\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
@@ -226,8 +228,7 @@ int main(int argc, wchar_t* argv[])
                tbb_thread_installer(){observe(true);}\r
                void on_scheduler_entry(bool is_worker)\r
                {\r
-                       //caspar::detail::SetThreadName(GetCurrentThreadId(), "tbb-worker-thread");\r
-                       caspar::win32_exception::install_handler();\r
+                       caspar::win32_exception::ensure_handler_installed_for_thread("tbb-worker-thread");\r
                }\r
        } tbb_thread_installer;\r
 \r
@@ -274,10 +275,13 @@ int main(int argc, wchar_t* argv[])
                        // anyway when the main thread terminates.\r
                        boost::thread stdin_thread([&caspar_server, &shutdown_server_now, &wait_for_keypress]\r
                        {\r
+                               caspar::win32_exception::ensure_handler_installed_for_thread("stdin-thread");\r
+\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
+                                               caspar_server.get_media_info_repo(),\r
                                                shutdown_server_now);\r
 \r
                                // Create a dummy client which prints amcp responses to console.\r