- Fixed diag to work with new SFML version.

[casparcg] / core / video_channel.cpp

diff --git a/core/video_channel.cpp b/core/video_channel.cpp
index e4d3e64f331d4df13f81ac02bf7471a3e491e752..086ad414236927a3991b14c9055614bb2dbbf62e 100644 (file)
--- a/core/video_channel.cpp
+++ b/core/video_channel.cpp
@@ -38,6 +38,7 @@
 #include <common/executor.h>
 
 #include <core/mixer/image/image_mixer.h>
+#include <core/diagnostics/call_context.h>
 
 #include <tbb/spin_mutex.h>
 
@@ -49,21 +50,26 @@ namespace caspar { namespace core {
 
 struct video_channel::impl final
 {
-       spl::shared_ptr<monitor::subject>                               monitor_subject_;
+       spl::shared_ptr<monitor::subject>                                       monitor_subject_;
 
-       const int                                                                               index_;
+       const int                                                                                       index_;
 
-       mutable tbb::spin_mutex                                                 format_desc_mutex_;
-       core::video_format_desc                                                 format_desc_;
+       mutable tbb::spin_mutex                                                         format_desc_mutex_;
+       core::video_format_desc                                                         format_desc_;
        
-       const spl::shared_ptr<diagnostics::graph>               graph_;
-
-       caspar::core::output                                                    output_;
-       spl::shared_ptr<image_mixer>                                    image_mixer_;
-       caspar::core::mixer                                                             mixer_;
-       caspar::core::stage                                                             stage_; 
-
-       executor                                                                                executor_                       = L"video_channel";
+       const spl::shared_ptr<caspar::diagnostics::graph>       graph_                          = [](int index)
+                                                                                                                                                         {
+                                                                                                                                                                 core::diagnostics::scoped_call_context save;
+                                                                                                                                                                 core::diagnostics::call_context::for_thread().video_channel = index;
+                                                                                                                                                                 return spl::make_shared<caspar::diagnostics::graph>();
+                                                                                                                                                         }(index_);
+
+       caspar::core::output                                                            output_;
+       spl::shared_ptr<image_mixer>                                            image_mixer_;
+       caspar::core::mixer                                                                     mixer_;
+       caspar::core::stage                                                                     stage_; 
+
+       executor                                                                                        executor_                       = L"video_channel";
 public:
        impl(int index, const core::video_format_desc& format_desc, std::unique_ptr<image_mixer> image_mixer)  
                : monitor_subject_(spl::make_shared<monitor::subject>(
@@ -75,9 +81,9 @@ public:
                , mixer_(graph_, image_mixer_)
                , stage_(graph_)
        {
-               graph_->set_color("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f));   
+               graph_->set_color("tick-time", caspar::diagnostics::color(0.0f, 0.6f, 0.9f));
                graph_->set_text(print());
-               diagnostics::register_graph(graph_);
+               caspar::diagnostics::register_graph(graph_);
                
                output_.monitor_output().attach_parent(monitor_subject_);
                stage_.monitor_output().attach_parent(monitor_subject_);
@@ -125,7 +131,8 @@ public:
                                                
                        output_(std::move(mixed_frame), format_desc);
                
-                       graph_->set_value("tick-time", frame_timer.elapsed()*format_desc.fps*0.5);
+                       auto frame_time = frame_timer.elapsed()*format_desc.fps*0.5;
+                       graph_->set_value("tick-time", frame_time);
 
                        *monitor_subject_       << monitor::message("/profiler/time")   % frame_timer.elapsed() % (1.0/format_desc_.fps)
                                                                << monitor::message("/format")                  % format_desc.name;
@@ -143,6 +150,11 @@ public:
                return L"video_channel[" + boost::lexical_cast<std::wstring>(index_) + L"|" +  video_format_desc().name + L"]";
        }
 
+       int index() const
+       {
+               return index_;
+       }
+
        boost::property_tree::wptree info() const
        {
                boost::property_tree::wptree info;
@@ -171,7 +183,8 @@ output& video_channel::output() { return impl_->output_;}
 spl::shared_ptr<frame_factory> video_channel::frame_factory() { return impl_->image_mixer_;} 
 core::video_format_desc video_channel::video_format_desc() const{return impl_->video_format_desc();}
 void core::video_channel::video_format_desc(const core::video_format_desc& format_desc){impl_->video_format_desc(format_desc);}
-boost::property_tree::wptree video_channel::info() const{return impl_->info();}                
-monitor::subject& video_channel::monitor_output(){return *impl_->monitor_subject_;}
+boost::property_tree::wptree video_channel::info() const{return impl_->info();}
+int video_channel::index() const { return impl_->index(); }
+monitor::subject& video_channel::monitor_output(){ return *impl_->monitor_subject_; }
 
 }}
\ No newline at end of file