git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index 0cee175e27af4ef33b96986eea38393221b38f16..d95c956bc49728bbc5b93710343d1ab3316a4886 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -157,8 +157,6 @@ public:
                {\r
                        return std::make_shared<blue_dma_buffer>(format_desc_.size, n++);\r
                });\r
-                                                               \r
-               CASPAR_LOG(info) << print() << L" Successfully Initialized.";\r
        }\r
 \r
        ~bluefish_consumer()\r
@@ -175,8 +173,6 @@ public:
                {\r
                        CASPAR_LOG_CURRENT_EXCEPTION();\r
                }\r
-               \r
-               CASPAR_LOG(info) << print() << L" Shutting down.";      \r
        }\r
        \r
        void enable_video_output()\r
@@ -306,12 +302,23 @@ public:
                , key_only_(key_only)\r
        {\r
        }\r
+       \r
+       ~bluefish_consumer_proxy()\r
+       {\r
+               if(consumer_)\r
+               {\r
+                       auto str = print();\r
+                       consumer_.reset();\r
+                       CASPAR_LOG(info) << str << L" Successfully Uninitialized.";     \r
+               }\r
+       }\r
 \r
        // frame_consumer\r
        \r
        virtual void initialize(const core::video_format_desc& format_desc, int channel_index, int sub_index) override\r
        {\r
                consumer_.reset(new bluefish_consumer(format_desc, device_index_, embedded_audio_, key_only_, channel_index, sub_index));\r
+               CASPAR_LOG(info) << print() << L" Successfully Initialized.";   \r
        }\r
        \r
        virtual bool send(const safe_ptr<core::read_frame>& frame) override\r
@@ -322,7 +329,7 @@ public:
                \r
        virtual std::wstring print() const override\r
        {\r
-               return consumer_->print();\r
+               return consumer_ ? consumer_->print() : L"[bluefish_consumer]";\r
        }\r
 \r
        size_t buffer_depth() const override\r

diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp
index 477a6acc9e663ea49ab159b9b7d9d94ba4e15344..89fc779107b776f79806f840a801ebfe52453710 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.cpp
+++ b/modules/decklink/consumer/decklink_consumer.cpp
@@ -434,9 +434,12 @@ public:
 \r
        ~decklink_consumer_proxy()\r
        {\r
-               auto str = print();\r
-               context_.reset();\r
-               CASPAR_LOG(info) << str << L" Successfully Uninitialized.";     \r
+               if(context_)\r
+               {\r
+                       auto str = print();\r
+                       context_.reset();\r
+                       CASPAR_LOG(info) << str << L" Successfully Uninitialized.";     \r
+               }\r
        }\r
 \r
        // frame_consumer\r
@@ -456,7 +459,7 @@ public:
        \r
        virtual std::wstring print() const override\r
        {\r
-               return context_->print();\r
+               return context_ ? context_->print() : L"[decklink_consumer]";\r
        }                       \r
 \r
        virtual size_t buffer_depth() const override\r

diff --git a/modules/decklink/interop/DeckLinkAPI_h.h b/modules/decklink/interop/DeckLinkAPI_h.h
index 15cac3ca491298f44f99cdc6957e1990f71d2c29..e834bfc54dd08eec98b8a0162c4e759611f94839 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 27 12:50:21 2011\r
+/* at Sun Nov 27 16:26:23 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 c780d7d203cf471b0b09f301e1c2cb72b69cdfb5..7b4276cdb551813e432321b3381defac903661c5 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 27 12:50:21 2011\r
+/* at Sun Nov 27 16:26:23 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/oal/consumer/oal_consumer.cpp b/modules/oal/consumer/oal_consumer.cpp
index 24cb6d9504f377a8ac2def2dc3b7f3cadafbf2fe..85f365fe0d74f80aebb0e6729cd026199969cc32 100644 (file)
--- a/modules/oal/consumer/oal_consumer.cpp
+++ b/modules/oal/consumer/oal_consumer.cpp
@@ -76,7 +76,8 @@ public:
                Stop();\r
                input_.try_push(std::make_shared<std::vector<int16_t, tbb::cache_aligned_allocator<int16_t>>>());\r
                input_.try_push(std::make_shared<std::vector<int16_t, tbb::cache_aligned_allocator<int16_t>>>());\r
-               CASPAR_LOG(info) << print() << L" Shutting down.";      \r
+\r
+               CASPAR_LOG(info) << print() << L" Successfully Uninitialized."; \r
        }\r
 \r
        // frame consumer\r
@@ -91,7 +92,7 @@ public:
                        sf::SoundStream::Initialize(2, 48000);\r
                        Play();         \r
                }\r
-               CASPAR_LOG(info) << print() << " Sucessfully initialized.";\r
+               CASPAR_LOG(info) << print() << " Sucessfully Initialized.";\r
        }\r
        \r
        virtual bool send(const safe_ptr<core::read_frame>& frame) override\r

diff --git a/modules/ogl/consumer/ogl_consumer.cpp b/modules/ogl/consumer/ogl_consumer.cpp
index 3c9480ee1e9560cf892bdef1cbd6fc80e9289b52..a7d07505eb8aae407ecceccbd45bab2ba920c711 100644 (file)
--- a/modules/ogl/consumer/ogl_consumer.cpp
+++ b/modules/ogl/consumer/ogl_consumer.cpp
@@ -440,12 +440,23 @@ public:
        ogl_consumer_proxy(const configuration& config)\r
                : config_(config){}\r
        \r
+       ~ogl_consumer_proxy()\r
+       {\r
+               if(consumer_)\r
+               {\r
+                       auto str = print();\r
+                       consumer_.reset();\r
+                       CASPAR_LOG(info) << str << L" Successfully Uninitialized.";     \r
+               }\r
+       }\r
+\r
        // frame_consumer\r
 \r
        virtual void initialize(const core::video_format_desc& format_desc, int channel_index, int sub_index) override\r
        {\r
                consumer_.reset();\r
                consumer_.reset(new ogl_consumer(config_, format_desc, channel_index, sub_index));\r
+               CASPAR_LOG(info) << print() << L" Successfully Initialized.";   \r
        }\r
        \r
        virtual bool send(const safe_ptr<core::read_frame>& frame) override\r
@@ -455,7 +466,7 @@ public:
        \r
        virtual std::wstring print() const override\r
        {\r
-               return consumer_->print();\r
+               return consumer_ ? consumer_->print() : L"[ogl_consumer]";\r
        }\r
 \r
        virtual bool has_synchronization_clock() const override\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 1d389568a10abbb14e5dd6f447e603809d5d3bcf..012bc52be0006874fcbf25934fe903c26f7e7a0f 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <configuration>\r
   <paths>\r
-    <media-path>C:\casparmedia\_media\</media-path>\r
-    <log-path>L:\casparcg\_log\</log-path>\r
-    <data-path>L:\casparcg\_data\</data-path>\r
-    <template-path>C:\casparmedia\_templates\</template-path>\r
+    <media-path>media\</media-path>\r
+    <log-path>log\</log-path>\r
+    <data-path>data\</data-path>\r
+    <template-path>templates\</template-path>\r
   </paths>\r
-  <blend-modes>true</blend-modes>\r
-  <auto-transcode>true</auto-transcode>\r
-  <pipeline-tokens>2</pipeline-tokens>\r
   <channels>\r
     <channel>\r
       <video-mode>PAL</video-mode>\r
       <consumers>\r
-        <screen>\r
-          <name>My Screen</name>\r
-        </screen>\r
+        <decklink>\r
+          <device>1</device>\r
+          <embedded-audio>true</embedded-audio>\r
+        </decklink>\r
       </consumers>\r
     </channel>\r
   </channels>\r