2.0.2: log: Use same log for entire day.

       main: Don't print ogl version.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.2@1570 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/common/log/log.cpp b/common/log/log.cpp
index 3446e5c34ac0f9ad5a118aae38fa7d6322ad47a4..061c3f5b56a99b6d805dcba8a59409c056d1e238 100644 (file)
--- a/common/log/log.cpp
+++ b/common/log/log.cpp
@@ -136,9 +136,10 @@ void add_file_sink(const std::wstring& folder)
                        BOOST_THROW_EXCEPTION(directory_not_found());\r
 \r
                auto file_sink = boost::make_shared<file_sink_type>(\r
-                       boost::log::keywords::file_name = (folder + L"caspar_%Y-%m-%d_%H-%M-%S.%N.log"),\r
+                       boost::log::keywords::file_name = (folder + L"caspar_%Y-%m-%d.log"),\r
                        boost::log::keywords::time_based_rotation = boost::log::sinks::file::rotation_at_time_point(0, 0, 0),\r
-                       boost::log::keywords::auto_flush = true\r
+                       boost::log::keywords::auto_flush = true,\r
+                       boost::log::keywords::open_mode = std::ios::app\r
                );\r
                \r
                file_sink->locked_backend()->set_formatter(&my_formatter);\r

diff --git a/modules/decklink/interop/DeckLinkAPI_h.h b/modules/decklink/interop/DeckLinkAPI_h.h
index 4d0524e5a10cc9035307c3b5cf9e6ac85a2292e2..32404b3d643c84fb8a78336e0ee87a27d9d3ac87 100644 (file)
--- a/modules/decklink/interop/DeckLinkAPI_h.h
+++ b/modules/decklink/interop/DeckLinkAPI_h.h
@@ -4,7 +4,7 @@
 \r
 \r
  /* File created by MIDL compiler version 7.00.0555 */\r
-/* at Sun Nov 13 20:29:25 2011\r
+/* at Mon Nov 14 10:20:06 2011\r
  */\r
 /* Compiler settings for interop\DeckLinkAPI.idl:\r
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 \r

diff --git a/modules/decklink/interop/DeckLinkAPI_i.c b/modules/decklink/interop/DeckLinkAPI_i.c
index 2d1ed95f296468e674d05765cdbe076cfce2649d..ad8774620b3503872b2814d2b9c20028d8f57cc6 100644 (file)
--- a/modules/decklink/interop/DeckLinkAPI_i.c
+++ b/modules/decklink/interop/DeckLinkAPI_i.c
@@ -6,7 +6,7 @@
 \r
 \r
  /* File created by MIDL compiler version 7.00.0555 */\r
-/* at Sun Nov 13 20:29:25 2011\r
+/* at Mon Nov 14 10:20:06 2011\r
  */\r
 /* Compiler settings for interop\DeckLinkAPI.idl:\r
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 \r

diff --git a/modules/decklink/util/util.h b/modules/decklink/util/util.h
index c733a319d1e6753b90d0d832a282aa96bb74c885..6a1a3a9e7007c65f9c99b399dcd6b2527b4256cf 100644 (file)
--- a/modules/decklink/util/util.h
+++ b/modules/decklink/util/util.h
@@ -99,12 +99,12 @@ BMDDisplayMode get_display_mode(const T& device, BMDDisplayMode format, BMDPixel
                \r
        BMDDisplayModeSupport displayModeSupport;\r
        if(FAILED(device->DoesSupportVideoMode(mode->GetDisplayMode(), pix_fmt, flag, &displayModeSupport, nullptr)) || displayModeSupport == bmdDisplayModeNotSupported)\r
-               CASPAR_LOG(warning) << L"Device does not support video-format.";\r
+               CASPAR_LOG(warning) << L"Device does not support video-format: " << mode->GetDisplayMode();\r
                //BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Device does not support requested video-format.")\r
                //                                                                               << arg_value_info(boost::lexical_cast<std::string>(format))\r
                //                                                                               << arg_name_info("format"));\r
        else if(displayModeSupport == bmdDisplayModeSupportedWithConversion)\r
-               CASPAR_LOG(warning) << L"Device supports video-format with conversion.";\r
+               CASPAR_LOG(warning) << L"Device supports video-format with conversion: " << mode->GetDisplayMode();\r
 \r
        return mode->GetDisplayMode();\r
 }\r

diff --git a/shell/main.cpp b/shell/main.cpp
index c55cd572f61b0298d375a5483ba7c35e084bd847..a00077db8b07dc1e0cad75228a6a7c4b253d25b3 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -173,7 +173,7 @@ void print_info()
        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
+       //CASPAR_LOG(info) << L"OpenGL " << caspar::core::ogl_device::get_version() << "\n\n"; // Dead-locks for some reason?\r
 }\r
 \r
 LONG WINAPI UserUnhandledExceptionFilter(EXCEPTION_POINTERS* info)\r