2.0.2: Improved log messages. In particular regarding GPU stall warning.

[casparcg] / shell / main.cpp

diff --git a/shell/main.cpp b/shell/main.cpp
index 7fac0539d82829256866d7800ceec1db211aa344..4ce3e24de7fe7ec70dd51fc3df0965d4b6b3bd44 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -59,6 +59,7 @@
 \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
@@ -121,28 +122,28 @@ void print_info()
        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
-       auto deck = 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
-       auto blue = 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
        \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
+       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
@@ -169,9 +170,7 @@ int main(int argc, wchar_t* argv[])
        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
@@ -185,6 +184,8 @@ int main(int argc, wchar_t* argv[])
 \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
@@ -203,6 +204,8 @@ int main(int argc, wchar_t* argv[])
                        caspar::win32_exception::install_handler();\r
                }\r
        } tbb_thread_installer;\r
+\r
+       tbb::task_scheduler_init init;\r
        \r
        try \r
        {\r