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

diff --git a/core/producer/color/color_producer.cpp b/core/producer/color/color_producer.cpp
index 142f140cc43eaf5f4dc76a7b7ffaf33f288752a3..6b6c2188fd1717ac99da142bfeec670f7e5c81b8 100644 (file)
--- a/core/producer/color/color_producer.cpp
+++ b/core/producer/color/color_producer.cpp
@@ -73,7 +73,7 @@ public:
        boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
-               info.add(L"type", L"color-producer");\r
+               info.add(L"type", L"color");\r
                info.add(L"color", color_str_);\r
                return info;\r
        }\r

diff --git a/core/producer/layer.cpp b/core/producer/layer.cpp
index ed0b1cf080706cbd032032bf31750eee077f5e3b..49acdbb209c4c26516ce52b99afb3dfa51e9570c 100644 (file)
--- a/core/producer/layer.cpp
+++ b/core/producer/layer.cpp
@@ -167,7 +167,7 @@ public:
 \r
                info.add(L"nb_frames",   nb_frames == std::numeric_limits<int64_t>::max() ? -1 : nb_frames);\r
                info.add(L"frames-left", nb_frames == std::numeric_limits<int64_t>::max() ? -1 : (foreground_->nb_frames() - frame_number_ - (auto_play_delta_ ? *auto_play_delta_ : 0)));\r
-               info.add_child(L"foreground.producer", foreground_->info());\r
+               info.add_child(L"producer", foreground_->info());\r
                info.add_child(L"background.producer", background_->info());\r
                return info;\r
        }\r

diff --git a/core/producer/separated/separated_producer.cpp b/core/producer/separated/separated_producer.cpp
index 65ccb3134cafaa609a89cda8607460ee69edbd9f..5774fd43ef838921d91567e6f16592f6a6eaca79 100644 (file)
--- a/core/producer/separated/separated_producer.cpp
+++ b/core/producer/separated/separated_producer.cpp
@@ -99,11 +99,7 @@ struct separated_producer : public frame_producer
 \r
        boost::property_tree::wptree info() const override\r
        {\r
-               boost::property_tree::wptree info;\r
-               info.add(L"type", L"separated-producer");\r
-               info.add_child(L"fill.producer",        fill_producer_->info());\r
-               info.add_child(L"key.producer", key_producer_->info());\r
-               return info;\r
+               return fill_producer_->info();;\r
        }\r
 \r
        virtual void subscribe(const monitor::observable::observer_ptr& o) override                                                                                                                     \r

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index 7e0b9d4a1d09858d722e49e3d4b34ea1965adf79..d39bec7d240686ca2302a832e1f3a0c9756097f8 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -129,11 +129,7 @@ struct transition_producer : public frame_producer
        \r
        boost::property_tree::wptree info() const override\r
        {\r
-               boost::property_tree::wptree info;\r
-               info.add(L"type", L"transition-producer");\r
-               info.add_child(L"source.producer",         source_producer_->info());\r
-               info.add_child(L"destination.producer", dest_producer_->info());\r
-               return info;\r
+               return dest_producer_->info();\r
        }\r
 \r
        // transition_producer\r

diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp
index a67c66ac517540a903502d5766f614b1928e5f2d..4d66646ea451c818820aff99f505523e5f452399 100644 (file)
--- a/modules/decklink/producer/decklink_producer.cpp
+++ b/modules/decklink/producer/decklink_producer.cpp
@@ -322,13 +322,13 @@ public:
        \r
        virtual std::wstring name() const override\r
        {\r
-               return L"decklinke";\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-producer");\r
+               info.add(L"type", L"decklink");\r
                return info;\r
        }\r
 };\r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index da285c30917e60769f7ee37a1258fad46fd5d1b3..02eb42c0706b55343d7898a95c902c11158c9f88 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -230,7 +230,7 @@ public:
        boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
-               info.add(L"type",                               L"ffmpeg-producer");\r
+               info.add(L"type",                               L"ffmpeg");\r
                info.add(L"filename",                   filename_);\r
                info.add(L"width",                              video_decoder_ ? video_decoder_->width() : 0);\r
                info.add(L"height",                             video_decoder_ ? video_decoder_->height() : 0);\r

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index d22b8912c3dfe58b611b9db2525767b126fc135c..524c8917f7fd1f15afeb43fcf85da36d1ceedcfe 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -430,7 +430,7 @@ public:
        virtual boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
-               info.add(L"type", L"flash-producer");\r
+               info.add(L"type", L"flash");\r
                return info;\r
        }\r
 \r

diff --git a/modules/image/producer/image_producer.cpp b/modules/image/producer/image_producer.cpp
index 0b77bb8dbf5a6fb081adc123ca50b302a7f4b887..09068e0f5257044f5bf3a6a01eed8e96c9bb854e 100644 (file)
--- a/modules/image/producer/image_producer.cpp
+++ b/modules/image/producer/image_producer.cpp
@@ -88,7 +88,7 @@ struct image_producer : public core::frame_producer
        virtual boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
-               info.add(L"type", L"image-producer");\r
+               info.add(L"type", L"image");\r
                info.add(L"filename", filename_);\r
                return info;\r
        }\r

diff --git a/modules/image/producer/image_scroll_producer.cpp b/modules/image/producer/image_scroll_producer.cpp
index 67071b15fe257bb2b8463e78ef815415fe2a3849..babb84f32fee63cfea292e94e80d1545b9d2e494 100644 (file)
--- a/modules/image/producer/image_scroll_producer.cpp
+++ b/modules/image/producer/image_scroll_producer.cpp
@@ -209,7 +209,7 @@ struct image_scroll_producer : public core::frame_producer
        virtual boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
-               info.add(L"type", L"image-scroll-producer");\r
+               info.add(L"type", L"image-scroll");\r
                info.add(L"filename", filename_);\r
                return info;\r
        }\r