Less verbose logging.

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

diff --git a/modules/flash/producer/FlashAxContainer.cpp b/modules/flash/producer/FlashAxContainer.cpp
index 63b8b090e788612ad0fbdd8aab9bb7dd93f130f3..0dce5b17917897a86360aa946d7905b88711092f 100644 (file)
--- a/modules/flash/producer/FlashAxContainer.cpp
+++ b/modules/flash/producer/FlashAxContainer.cpp
@@ -608,12 +608,12 @@ void STDMETHODCALLTYPE FlashAxContainer::OnFlashCall(BSTR request)
        }\r
        else if(str.find(TEXT("OnCommand")) != std::wstring::npos) {\r
                //this is how templatehost 1.8 reports that a command has been received\r
-               CASPAR_LOG(debug)  << print_()  << L" Command: \n-------------------------------------------\n" << str << L"\n-------------------------------------------";\r
+               CASPAR_LOG(debug)  << print_()  << L" Command: " << str;\r
                bCallSuccessful_ = true;\r
        }\r
        else if(str.find(TEXT("Activity")) != std::wstring::npos)\r
        {\r
-               CASPAR_LOG(debug) << print_() << L" Activity: \n-------------------------------------------\n" << str << L"\n-------------------------------------------";\r
+               CASPAR_LOG(debug) << print_() << L" Activity: " << str;\r
 \r
                //this is how templatehost 1.7 reports that a command has been received\r
                if(str.find(TEXT("Command recieved")) != std::wstring::npos)\r
@@ -627,7 +627,7 @@ void STDMETHODCALLTYPE FlashAxContainer::OnFlashCall(BSTR request)
        }\r
        else if(str.find(TEXT("OnNotify")) != std::wstring::npos)\r
        {\r
-               CASPAR_LOG(info) << print_() << L" Notification: \n-------------------------------------------\n" << str << L"\n-------------------------------------------";\r
+               CASPAR_LOG(info) << print_() << L" Notification: " << str;\r
 \r
                //if(pFlashProducer_ != 0 && pFlashProducer_->pMonitor_) {\r
                //      std::wstring::size_type pos = str.find(TEXT('@'));\r
@@ -643,11 +643,11 @@ void STDMETHODCALLTYPE FlashAxContainer::OnFlashCall(BSTR request)
        }\r
        else if(str.find(TEXT("OnError")) != std::wstring::npos)\r
        {\r
-               CASPAR_LOG(error) << print_() << L" Error: \n-------------------------------------------\n" << str << L"\n-------------------------------------------";\r
+               CASPAR_LOG(error) << print_() << L" Error: " << str;\r
        }\r
        else if(str.find(TEXT("OnDebug")) != std::wstring::npos)\r
        {\r
-               CASPAR_LOG(error) << print_() << L" Debug: \n-------------------------------------------\n" << str << L"\n-------------------------------------------";\r
+               CASPAR_LOG(error) << print_() << L" Debug: " << str;\r
        }\r
        //else if(str.find(TEXT("OnTemplateDescription")) != std::wstring::npos)\r
        //{\r

diff --git a/protocol/util/ClientInfo.h b/protocol/util/ClientInfo.h
index 392195fd9590cf365798074df0a020da645c08f5..5278d34c3103626aae4f3cacbc678bd1cede0b5f 100644 (file)
--- a/protocol/util/ClientInfo.h
+++ b/protocol/util/ClientInfo.h
@@ -46,7 +46,7 @@ struct ConsoleClientInfo : public caspar::IO::ClientInfo
 {\r
        void Send(const std::wstring& data)\r
        {\r
-               std::wcout << (L"\n--------------------\n" + data + L"--------------------\n");\r
+               std::wcout << (L"#" + data);\r
        }\r
        void Disconnect(){}\r
 };\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index a2b2c9d3c6e9fe3ec57f38f059b355e36a21a149..a55297017338d2da4e8e2d255866a178e083d721 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -9,18 +9,12 @@
   <log-level>trace</log-level>\r
   <channel-grid>true</channel-grid>\r
   <channels>\r
-    <channel>\r
-      <video-mode>PAL</video-mode>\r
-      <consumers>\r
-        <screen>            \r
-        </screen>   \r
-      </consumers>\r
-    </channel>\r
     <channel>\r
       <video-mode>720p5000</video-mode>\r
       <consumers>\r
         <screen>          \r
         </screen>\r
+        <system-audio></system-audio>\r
       </consumers>\r
     </channel>\r
   </channels>\r