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

diff --git a/core/consumer/frame_consumer.cpp b/core/consumer/frame_consumer.cpp
index fa8246ebe791294a262eb3eaca0cfe49db472a97..df56e3681972633ba94405a06d2de8f42f90d7d5 100644 (file)
--- a/core/consumer/frame_consumer.cpp
+++ b/core/consumer/frame_consumer.cpp
@@ -78,7 +78,8 @@ public:
        \r
        virtual bool send(const spl::shared_ptr<const class data_frame>& frame) override                                        {return (*consumer_)->send(frame);}\r
        virtual void initialize(const struct video_format_desc& format_desc, int channel_index) override        {return (*consumer_)->initialize(format_desc, channel_index);}\r
-       virtual std::wstring print() const override                                                                                                                     {return (*consumer_)->print();}\r
+       virtual std::wstring print() const override                                                                                                                     {return (*consumer_)->print();} \r
+       virtual std::wstring name() const override                                                                                                                      {return (*consumer_)->name();}\r
        virtual boost::property_tree::wptree info() const override                                                                                      {return (*consumer_)->info();}\r
        virtual bool has_synchronization_clock() const override                                                                                         {return (*consumer_)->has_synchronization_clock();}\r
        virtual int buffer_depth() const override                                                                                                                       {return (*consumer_)->buffer_depth();}\r
@@ -106,6 +107,7 @@ public:
        virtual bool send(const spl::shared_ptr<const class data_frame>& frame) override                                        {return consumer_->send(frame);}\r
        virtual void initialize(const struct video_format_desc& format_desc, int channel_index) override        {return consumer_->initialize(format_desc, channel_index);}\r
        virtual std::wstring print() const override                                                                                                                     {return consumer_->print();}\r
+       virtual std::wstring name() const override                                                                                                                      {return consumer_->name();}\r
        virtual boost::property_tree::wptree info() const override                                                                                      {return consumer_->info();}\r
        virtual bool has_synchronization_clock() const override                                                                                         {return consumer_->has_synchronization_clock();}\r
        virtual int buffer_depth() const override                                                                                                                       {return consumer_->buffer_depth();}\r
@@ -154,6 +156,7 @@ public:
        }\r
 \r
        virtual std::wstring print() const override                                     {return consumer_->print();}\r
+       virtual std::wstring name() const override                                      {return consumer_->name();}\r
        virtual boost::property_tree::wptree info() const override      {return consumer_->info();}\r
        virtual bool has_synchronization_clock() const override         {return consumer_->has_synchronization_clock();}\r
        virtual int buffer_depth() const override                                       {return consumer_->buffer_depth();}\r
@@ -201,6 +204,7 @@ public:
        }\r
        \r
        virtual std::wstring print() const override                                     {return consumer_->print();}\r
+       virtual std::wstring name() const override                                      {return consumer_->name();}\r
        virtual boost::property_tree::wptree info() const override      {return consumer_->info();}\r
        virtual bool has_synchronization_clock() const override         {return consumer_->has_synchronization_clock();}\r
        virtual int buffer_depth() const override                                       {return consumer_->buffer_depth();}\r
@@ -244,13 +248,14 @@ const spl::shared_ptr<frame_consumer>& frame_consumer::empty()
                virtual bool send(const spl::shared_ptr<const data_frame>&) override {return false;}\r
                virtual void initialize(const video_format_desc&, int) override{}\r
                virtual std::wstring print() const override {return L"empty";}\r
+               virtual std::wstring name() const override {return L"empty";}\r
                virtual bool has_synchronization_clock() const override {return false;}\r
                virtual int buffer_depth() const override {return 0;};\r
                virtual int index() const{return -1;}\r
                virtual boost::property_tree::wptree info() const override\r
                {\r
                        boost::property_tree::wptree info;\r
-                       info.add(L"type", L"empty-consumer");\r
+                       info.add(L"type", L"empty");\r
                        return info;\r
                }\r
        };\r

diff --git a/core/consumer/frame_consumer.h b/core/consumer/frame_consumer.h
index 4a0a777dcf253bea292977ca37364893e6f83ee9..51d9bbe60026bc8a25e4a881ac002bd4e57f0ab6 100644 (file)
--- a/core/consumer/frame_consumer.h
+++ b/core/consumer/frame_consumer.h
@@ -38,13 +38,15 @@ public:
        frame_consumer(){}\r
        virtual ~frame_consumer() {}\r
        \r
-       virtual bool send(const spl::shared_ptr<const class data_frame>& frame) = 0;\r
-       virtual void initialize(const struct video_format_desc& format_desc, int channel_index) = 0;\r
-       virtual std::wstring print() const = 0;\r
-       virtual boost::property_tree::wptree info() const = 0;\r
-       virtual bool has_synchronization_clock() const {return true;}\r
-       virtual int buffer_depth() const = 0;\r
-       virtual int index() const = 0;\r
+       virtual std::wstring                                    print() const = 0;\r
+       virtual std::wstring                                    name() const = 0;\r
+       virtual boost::property_tree::wptree    info() const = 0;\r
+       virtual bool                                                    has_synchronization_clock() const {return true;}\r
+       virtual int                                                             buffer_depth() const = 0;\r
+       virtual int                                                             index() const = 0;\r
+\r
+       virtual bool                                                    send(const spl::shared_ptr<const class data_frame>& frame) = 0;\r
+       virtual void                                                    initialize(const struct video_format_desc& format_desc, int channel_index) = 0;\r
 \r
        static const spl::shared_ptr<frame_consumer>& empty();\r
 };\r

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index 88f5cb4eb90bc6a3b8602d0c48905638e94ef36b..6558beab689bf44a26b72a0ad7662e80941ebd8d 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -332,10 +332,15 @@ public:
                return consumer_ ? consumer_->print() : L"[bluefish_consumer]";\r
        }\r
 \r
+       virtual std::wstring name() const override\r
+       {\r
+               return L"bluefish";\r
+       }\r
+\r
        virtual boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
-               info.add(L"type", L"bluefish-consumer");\r
+               info.add(L"type", L"bluefish");\r
                info.add(L"key-only", key_only_);\r
                info.add(L"device", device_index_);\r
                info.add(L"embedded-audio", embedded_audio_);\r

diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp
index 67938ef751f59f2d8f97265ee05ada74f869a16f..84788028ee74ea531f7e189c2b7997a1d15042a2 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.cpp
+++ b/modules/decklink/consumer/decklink_consumer.cpp
@@ -532,10 +532,15 @@ public:
                return consumer_ ? consumer_->print() : L"[decklink_consumer]";\r
        }               \r
 \r
+       virtual std::wstring name() const override\r
+       {\r
+               return L"decklink";\r
+       }\r
+\r
        virtual boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
-               info.add(L"type", L"decklink-consumer");\r
+               info.add(L"type", L"decklink");\r
                info.add(L"key-only", config_.key_only);\r
                info.add(L"device", config_.device_index);\r
                info.add(L"low-latency", config_.low_latency);\r

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index 4569723fe64292465a23779c80375a44a483d840..bf68377fe1e92af0667d2a45e131d5b50429b407 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -414,10 +414,15 @@ public:
                return consumer_ ? consumer_->print() : L"[ffmpeg_consumer]";\r
        }\r
 \r
+       virtual std::wstring name() const override\r
+       {\r
+               return L"file";\r
+       }\r
+\r
        virtual boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
-               info.add(L"type", L"ffmpeg-consumer");\r
+               info.add(L"type", L"file");\r
                info.add(L"key-only", key_only_);\r
                info.add(L"filename", filename_);\r
                info.add(L"vcodec", codec_);\r

diff --git a/modules/image/consumer/image_consumer.cpp b/modules/image/consumer/image_consumer.cpp
index c9304668d1a4a6ff40ff0375853cedc8b5660242..2214c87801134c1c315cbd1cf350bff2a49e048a 100644 (file)
--- a/modules/image/consumer/image_consumer.cpp
+++ b/modules/image/consumer/image_consumer.cpp
@@ -80,11 +80,16 @@ public:
        {\r
                return L"image[]";\r
        }\r
+       \r
+       virtual std::wstring name() const override\r
+       {\r
+               return L"image";\r
+       }\r
 \r
        virtual boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
-               info.add(L"type", L"image-consumer");\r
+               info.add(L"type", L"image");\r
                return info;\r
        }\r
 \r

diff --git a/modules/oal/consumer/oal_consumer.cpp b/modules/oal/consumer/oal_consumer.cpp
index b9fedb755e4fd4806c953b35c3db42be3b5aab19..c401e973a061fe52eb0961279128dd920b2fd275 100644 (file)
--- a/modules/oal/consumer/oal_consumer.cpp
+++ b/modules/oal/consumer/oal_consumer.cpp
@@ -106,10 +106,15 @@ public:
                return L"oal[" + boost::lexical_cast<std::wstring>(channel_index_) + L"|" + format_desc_.name + L"]";\r
        }\r
 \r
+       virtual std::wstring name() const override\r
+       {\r
+               return L"system-audio";\r
+       }\r
+\r
        virtual boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
-               info.add(L"type", L"oal-consumer");\r
+               info.add(L"type", L"system-audio");\r
                return info;\r
        }\r
        \r

diff --git a/modules/screen/consumer/screen_consumer.cpp b/modules/screen/consumer/screen_consumer.cpp
index e6256557e0c678b8235c7bb9a29d95fd9b4a508d..17915bc1c5c07a0dfa6f4de3f79ae0fda779100c 100644 (file)
--- a/modules/screen/consumer/screen_consumer.cpp
+++ b/modules/screen/consumer/screen_consumer.cpp
@@ -488,10 +488,15 @@ public:
                return consumer_ ? consumer_->print() : L"[screen_consumer]";\r
        }\r
 \r
+       virtual std::wstring name() const override\r
+       {\r
+               return L"screen";\r
+       }\r
+\r
        virtual boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
-               info.add(L"type", L"ogl-consumer");\r
+               info.add(L"type", L"screen");\r
                info.add(L"key-only", config_.key_only);\r
                info.add(L"windowed", config_.windowed);\r
                info.add(L"auto-deinterlace", config_.auto_deinterlace);\r