2.0.2: INFO further improved. STATUS 1-1 removed in favor of INFO 1-1.

[casparcg] / core / producer / stage.cpp

diff --git a/core/producer/stage.cpp b/core/producer/stage.cpp
index 3799b87a1f274c797f040e4408bf237544aed901..6f1ba98b48e331273a8ac8996668e82018e98c38 100644 (file)
--- a/core/producer/stage.cpp
+++ b/core/producer/stage.cpp
@@ -34,6 +34,8 @@
 \r
 #include <tbb/parallel_for_each.h>\r
 \r
+#include <boost/property_tree/ptree.hpp>\r
+\r
 #include <map>\r
 \r
 namespace caspar { namespace core {\r
@@ -201,15 +203,7 @@ public:
                        }, high_priority);\r
                }\r
        }\r
-\r
-       boost::unique_future<layer_status> get_status(int index)\r
-       {               \r
-               return executor_.begin_invoke([=]\r
-               {\r
-                       return layers_[index].status();\r
-               }, high_priority );\r
-       }\r
-       \r
+               \r
        boost::unique_future<safe_ptr<frame_producer>> foreground(int index)\r
        {\r
                return executor_.begin_invoke([=]\r
@@ -231,7 +225,27 @@ public:
                executor_.begin_invoke([=]\r
                {\r
                        format_desc_ = format_desc;\r
-               }, high_priority );\r
+               }, high_priority);\r
+       }\r
+\r
+       boost::unique_future<boost::property_tree::wptree> info()\r
+       {\r
+               return std::move(executor_.begin_invoke([&]() -> boost::property_tree::wptree\r
+               {\r
+                       boost::property_tree::wptree info;\r
+                       BOOST_FOREACH(auto& layer, layers_)                     \r
+                               info.add_child(L"layers.layer", layer.second.info())\r
+                                       .add(L"index", layer.first);    \r
+                       return info;\r
+               }, high_priority));\r
+       }\r
+\r
+       boost::unique_future<boost::property_tree::wptree> info(int index)\r
+       {\r
+               return std::move(executor_.begin_invoke([&]() -> boost::property_tree::wptree\r
+               {\r
+                       return layers_[index].info();\r
+               }, high_priority));\r
        }\r
 };\r
 \r
@@ -246,9 +260,10 @@ void stage::clear(){impl_->clear();}
 void stage::swap_layers(const safe_ptr<stage>& other){impl_->swap_layers(other);}\r
 void stage::swap_layer(int index, size_t other_index){impl_->swap_layer(index, other_index);}\r
 void stage::swap_layer(int index, size_t other_index, const safe_ptr<stage>& other){impl_->swap_layer(index, other_index, other);}\r
-boost::unique_future<layer_status> stage::get_status(int index){return impl_->get_status(index);}\r
-boost::unique_future<safe_ptr<frame_producer>> stage::foreground(size_t index) {return impl_->foreground(index);}\r
-boost::unique_future<safe_ptr<frame_producer>> stage::background(size_t index) {return impl_->background(index);}\r
+boost::unique_future<safe_ptr<frame_producer>> stage::foreground(int index) {return impl_->foreground(index);}\r
+boost::unique_future<safe_ptr<frame_producer>> stage::background(int index) {return impl_->background(index);}\r
 boost::unique_future<std::wstring> stage::call(int index, bool foreground, const std::wstring& param){return impl_->call(index, foreground, param);}\r
 void stage::set_video_format_desc(const video_format_desc& format_desc){impl_->set_video_format_desc(format_desc);}\r
+boost::unique_future<boost::property_tree::wptree> stage::info() const{return impl_->info();}\r
+boost::unique_future<boost::property_tree::wptree> stage::info(int index) const{return impl_->info(index);}\r
 }}
\ No newline at end of file