2.0.2: Improved INFO.

[casparcg] / core / mixer / mixer.cpp

diff --git a/core/mixer/mixer.cpp b/core/mixer/mixer.cpp
index 045dbe36bf70544463debaa45ed6d8086c8b7515..793bf395e12d46c41bfc08636eee150aa7027366 100644 (file)
--- a/core/mixer/mixer.cpp
+++ b/core/mixer/mixer.cpp
@@ -44,6 +44,7 @@
 \r
 #include <boost/foreach.hpp>\r
 #include <boost/timer.hpp>\r
+#include <boost/property_tree/ptree.hpp>\r
 \r
 #include <tbb/concurrent_queue.h>\r
 #include <tbb/spin_mutex.h>\r
@@ -225,6 +226,13 @@ public:
                tbb::spin_mutex::scoped_lock lock(format_desc_mutex_);\r
                return format_desc_;\r
        }\r
+\r
+       boost::unique_future<boost::property_tree::wptree> info() const\r
+       {\r
+               boost::promise<boost::property_tree::wptree> info;\r
+               info.set_value(boost::property_tree::wptree());\r
+               return info.get_future();\r
+       }\r
 };\r
        \r
 mixer::mixer(const safe_ptr<diagnostics::graph>& graph, const safe_ptr<target_t>& target, const video_format_desc& format_desc, const safe_ptr<ogl_device>& ogl) \r
@@ -239,4 +247,5 @@ void mixer::clear_transforms(int index){impl_->clear_transforms(index);}
 void mixer::clear_transforms(){impl_->clear_transforms();}\r
 void mixer::set_blend_mode(int index, blend_mode::type value){impl_->set_blend_mode(index, value);}\r
 void mixer::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> mixer::info() const{return impl_->info();}\r
 }}
\ No newline at end of file