2.0.2: Improved INFO.

[casparcg] / core / mixer / mixer.h

diff --git a/core/mixer/mixer.h b/core/mixer/mixer.h
index d1c841d3e2523c67918efd7218d5e8a2061ef48a..d17207772975557789e15aad08b48d49163172b9 100644 (file)
--- a/core/mixer/mixer.h
+++ b/core/mixer/mixer.h
@@ -27,6 +27,9 @@
 #include <common/concurrency/target.h>\r
 #include <common/diagnostics/graph.h>\r
 \r
+#include <boost/property_tree/ptree_fwd.hpp>\r
+#include <boost/thread/future.hpp>\r
+\r
 #include <map>\r
 \r
 namespace caspar { \r
@@ -42,7 +45,8 @@ class ogl_device;
 struct frame_transform;\r
 struct pixel_format;\r
 \r
-class mixer : public target<std::pair<std::map<int, safe_ptr<core::basic_frame>>, std::shared_ptr<void>>>, public core::frame_factory\r
+class mixer : public target<std::pair<std::map<int, safe_ptr<core::basic_frame>>, std::shared_ptr<void>>>\r
+                       , public core::frame_factory\r
 {\r
 public:        \r
        typedef target<std::pair<safe_ptr<read_frame>, std::shared_ptr<void>>> target_t;\r
@@ -66,6 +70,8 @@ public:
        void clear_transforms();\r
 \r
        void set_blend_mode(int index, blend_mode::type value);\r
+\r
+       boost::unique_future<boost::property_tree::wptree> info() const;\r
        \r
 private:\r
        struct implementation;\r