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

diff --git a/core/consumer/bluefish/bluefish_consumer.cpp b/core/consumer/bluefish/bluefish_consumer.cpp
index c4cc97ac1af4a2d6ddd9b13731005d7659b50f0f..490a64503a4edd2831f931a69f8ea95f3a2e3c07 100644 (file)
--- a/core/consumer/bluefish/bluefish_consumer.cpp
+++ b/core/consumer/bluefish/bluefish_consumer.cpp
@@ -358,7 +358,8 @@ void bluefish_consumer::initialize(const video_format_desc& format_desc){impl_->
 void bluefish_consumer::set_parent_printer(const printer& parent_printer){impl_->set_parent_printer(parent_printer);}\r
 void bluefish_consumer::send(const safe_ptr<const read_frame>& frame){impl_->send(frame);}\r
 size_t bluefish_consumer::buffer_depth() const{return impl_->buffer_depth();}\r
-       \r
+std::wstring bluefish_consumer::print() const {return impl_->print();} \r
+\r
 safe_ptr<frame_consumer> create_bluefish_consumer(const std::vector<std::wstring>& params)\r
 {\r
        if(params.size() < 1 || params[0] != L"BLUEFISH")\r

diff --git a/core/consumer/bluefish/bluefish_consumer.h b/core/consumer/bluefish/bluefish_consumer.h
index 2fae9d1a55a92532689c18b0760fc7897ff52e8c..0e106e3b289a0e90f6d17d6ccfef0131c9b42a68 100644 (file)
--- a/core/consumer/bluefish/bluefish_consumer.h
+++ b/core/consumer/bluefish/bluefish_consumer.h
@@ -36,6 +36,7 @@ public:
        virtual void set_parent_printer(const printer& parent_printer);\r
        virtual void send(const safe_ptr<const read_frame>&);\r
        virtual size_t buffer_depth() const;\r
+       virtual std::wstring print() const;\r
 private:\r
        struct implementation;\r
        std::shared_ptr<implementation> impl_;\r

diff --git a/core/consumer/decklink/decklink_consumer.cpp b/core/consumer/decklink/decklink_consumer.cpp
index 3bfa9b2ec37e3157567ac6125fef14d4dc21dcf0..01e844903594ebbd78c2587138ed34a02f1a44e0 100644 (file)
--- a/core/consumer/decklink/decklink_consumer.cpp
+++ b/core/consumer/decklink/decklink_consumer.cpp
@@ -326,6 +326,11 @@ public:
        {\r
                return 1;\r
        }\r
+\r
+       std::wstring print() const\r
+       {\r
+               return input_->print();\r
+       }\r
 };\r
 \r
 decklink_consumer::decklink_consumer(size_t device_index, bool embed_audio, bool internalKey) : impl_(new implementation(device_index, embed_audio, internalKey)){}\r
@@ -334,6 +339,7 @@ void decklink_consumer::initialize(const video_format_desc& format_desc){impl_->
 void decklink_consumer::set_parent_printer(const printer& parent_printer){impl_->set_parent_printer(parent_printer);}\r
 void decklink_consumer::send(const safe_ptr<const read_frame>& frame){impl_->send(frame);}\r
 size_t decklink_consumer::buffer_depth() const{return impl_->buffer_depth();}\r
+std::wstring decklink_consumer::print() const{return impl_->print();}\r
        \r
 safe_ptr<frame_consumer> create_decklink_consumer(const std::vector<std::wstring>& params)\r
 {\r

diff --git a/core/consumer/decklink/decklink_consumer.h b/core/consumer/decklink/decklink_consumer.h
index 025110a13ccb27e621b5ba4354cf1e8da140528c..4f29a893b7d4c176b2cd510f7acebfeed6219bde 100644 (file)
--- a/core/consumer/decklink/decklink_consumer.h
+++ b/core/consumer/decklink/decklink_consumer.h
@@ -35,6 +35,7 @@ public:
        virtual void set_parent_printer(const printer& parent_printer);\r
        virtual void send(const safe_ptr<const read_frame>&);\r
        virtual size_t buffer_depth() const;\r
+       virtual std::wstring print() const;\r
 private:\r
        struct implementation;\r
        std::tr1::shared_ptr<implementation> impl_;\r

diff --git a/core/consumer/ffmpeg/ffmpeg_consumer.cpp b/core/consumer/ffmpeg/ffmpeg_consumer.cpp
index 84e850bd1ad617e248cde3933a07bb91273f7c01..46df6b74ae2a6c0c659f37d918049a02684c1afb 100644 (file)
--- a/core/consumer/ffmpeg/ffmpeg_consumer.cpp
+++ b/core/consumer/ffmpeg/ffmpeg_consumer.cpp
@@ -406,6 +406,7 @@ void ffmpeg_consumer::send(const safe_ptr<const read_frame>& frame){impl_->send(
 size_t ffmpeg_consumer::buffer_depth() const{return impl_->buffer_depth();}\r
 void ffmpeg_consumer::initialize(const video_format_desc& format_desc) {impl_->initialize(format_desc);}\r
 void ffmpeg_consumer::set_parent_printer(const printer& parent_printer){impl_->set_parent_printer(parent_printer);}\r
+std::wstring ffmpeg_consumer::print() const {return impl_->print();}\r
 \r
 safe_ptr<frame_consumer> create_ffmpeg_consumer(const std::vector<std::wstring>& params)\r
 {\r

diff --git a/core/consumer/ffmpeg/ffmpeg_consumer.h b/core/consumer/ffmpeg/ffmpeg_consumer.h
index 6465dc338627f48854833020c2449b4f7f0d1924..58543b2a3e380aa9da7863b985f470664bfbcb42 100644 (file)
--- a/core/consumer/ffmpeg/ffmpeg_consumer.h
+++ b/core/consumer/ffmpeg/ffmpeg_consumer.h
@@ -34,6 +34,7 @@ public:
        virtual void set_parent_printer(const printer& parent_printer);\r
        virtual void send(const safe_ptr<const read_frame>&);\r
        virtual size_t buffer_depth() const;\r
+       virtual std::wstring print() const;\r
 private:\r
        struct implementation;\r
        std::shared_ptr<implementation> impl_;\r

diff --git a/core/consumer/frame_consumer.h b/core/consumer/frame_consumer.h
index 96a9ec6ea65c18d8b6f46940da1c86859d586ded..a027e6a6d7395d4d36bee740674b351045f1720b 100644 (file)
--- a/core/consumer/frame_consumer.h
+++ b/core/consumer/frame_consumer.h
@@ -20,10 +20,11 @@
 #pragma once\r
 \r
 #include <common/memory/safe_ptr.h>\r
+#include <common/utility/printer.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r
-#include <common/utility/printer.h>\r
+#include <string>\r
 \r
 namespace caspar { namespace core {\r
        \r
@@ -38,6 +39,7 @@ struct frame_consumer : boost::noncopyable
        virtual size_t buffer_depth() const = 0;\r
        virtual void initialize(const video_format_desc& format_desc) = 0;\r
        virtual void set_parent_printer(const printer& parent_printer) = 0;\r
+       virtual std::wstring print() const = 0;\r
 \r
        static const safe_ptr<frame_consumer>& empty()\r
        {\r
@@ -45,8 +47,9 @@ struct frame_consumer : boost::noncopyable
                {\r
                        virtual void send(const safe_ptr<const read_frame>&){}\r
                        virtual size_t buffer_depth() const{return 0;}\r
-                       void initialize(const video_format_desc&){}\r
-                       void set_parent_printer(const printer&){}\r
+                       virtual void initialize(const video_format_desc&){}\r
+                       virtual void set_parent_printer(const printer&){}\r
+                       virtual std::wstring print() const {return L"empty";}\r
                };\r
                static safe_ptr<frame_consumer> consumer = make_safe<empty_frame_consumer>();\r
                return consumer;\r

diff --git a/core/consumer/frame_consumer_device.cpp b/core/consumer/frame_consumer_device.cpp
index e47453d1350faea9916905b58be61fc9a3dae0d4..1c70407ed5af69e1a484bc6d1773ecc4e244a2e1 100644 (file)
--- a/core/consumer/frame_consumer_device.cpp
+++ b/core/consumer/frame_consumer_device.cpp
@@ -67,7 +67,10 @@ public:
                {\r
                        auto it = consumers_.find(index);\r
                        if(it != consumers_.end())\r
+                       {\r
+                               CASPAR_LOG(info) << it->second->print() << L" Removed.";\r
                                consumers_.erase(it);\r
+                       }\r
                });\r
        }\r
                                \r

diff --git a/core/consumer/oal/oal_consumer.cpp b/core/consumer/oal/oal_consumer.cpp
index c5cb12e9362bf093bf8666f0766f5410feb74c41..e5974fb552a121a5646f45b30c5dc4194734f292 100644 (file)
--- a/core/consumer/oal/oal_consumer.cpp
+++ b/core/consumer/oal/oal_consumer.cpp
@@ -116,6 +116,7 @@ void oal_consumer::send(const safe_ptr<const read_frame>& frame){impl_->send(fra
 size_t oal_consumer::buffer_depth() const{return impl_->buffer_depth();}\r
 void oal_consumer::initialize(const video_format_desc& format_desc){impl_->initialize(format_desc);}\r
 void oal_consumer::set_parent_printer(const printer& parent_printer){impl_->set_parent_printer(parent_printer);}\r
+std::wstring oal_consumer::print() const { return impl_->print(); }\r
 \r
 safe_ptr<frame_consumer> create_oal_consumer(const std::vector<std::wstring>& params)\r
 {\r

diff --git a/core/consumer/oal/oal_consumer.h b/core/consumer/oal/oal_consumer.h
index 759bad70c35067e83f50dc1f950d4824b2851f8e..b550ce4c00ecc0016e3e7f7a5ab474eade2ae17d 100644 (file)
--- a/core/consumer/oal/oal_consumer.h
+++ b/core/consumer/oal/oal_consumer.h
@@ -35,6 +35,7 @@ public:
 \r
        virtual void send(const safe_ptr<const read_frame>&);\r
        virtual size_t buffer_depth() const;\r
+       virtual std::wstring print() const;\r
 private:\r
        struct implementation;\r
        std::shared_ptr<implementation> impl_;\r

diff --git a/core/consumer/ogl/ogl_consumer.cpp b/core/consumer/ogl/ogl_consumer.cpp
index 8fd053f88997aee8c9fa717287fc3e562856757e..3b6a6ada018deb08e131ee61d83b12f970121569 100644 (file)
--- a/core/consumer/ogl/ogl_consumer.cpp
+++ b/core/consumer/ogl/ogl_consumer.cpp
@@ -1,4 +1,4 @@
-/*\r
+/*\r
 * copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
 *\r
 *  This file is part of CasparCG.\r
@@ -286,6 +286,7 @@ void ogl_consumer::send(const safe_ptr<const read_frame>& frame){impl_->send(fra
 size_t ogl_consumer::buffer_depth() const{return impl_->buffer_depth();}\r
 void ogl_consumer::initialize(const video_format_desc& format_desc){impl_->initialize(format_desc);}\r
 void ogl_consumer::set_parent_printer(const printer& parent_printer){impl_->set_parent_printer(parent_printer);}\r
+std::wstring ogl_consumer::print() const {return impl_->print();}\r
 \r
 safe_ptr<frame_consumer> create_ogl_consumer(const std::vector<std::wstring>& params)\r
 {\r

diff --git a/core/consumer/ogl/ogl_consumer.h b/core/consumer/ogl/ogl_consumer.h
index fe6eaca83e6b4ec8b3fa462241244177d73cf9a3..f9d547ee0875dabe044fa7a500586ea61a26f014 100644 (file)
--- a/core/consumer/ogl/ogl_consumer.h
+++ b/core/consumer/ogl/ogl_consumer.h
@@ -44,6 +44,7 @@ public:
        virtual void set_parent_printer(const printer& parent_printer);\r
        virtual void send(const safe_ptr<const read_frame>&);\r
        virtual size_t buffer_depth() const;\r
+       virtual std::wstring print() const;\r
 private:\r
        struct implementation;\r
        std::shared_ptr<implementation> impl_;\r