2.0.0.2: Some minor updates on graphs.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@846 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/video_channel.cpp b/core/video_channel.cpp
index e61ac571d6c1ff46b829a2d10968e44686e5492f..96812ad929e334cc1393e581bcf4fef8c98a3893 100644 (file)
--- a/core/video_channel.cpp
+++ b/core/video_channel.cpp
@@ -63,8 +63,6 @@ public:
                diag_->set_color("produce-time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
                diag_->add_guide("mix-time", 0.5f);     \r
                diag_->set_color("mix-time", diagnostics::color(1.0f, 0.0f, 1.0f));\r
-               diag_->add_guide("consume-time", 0.5f); \r
-               diag_->set_color("consume-time", diagnostics::color(1.0f, 1.0f, 0.0f));\r
                diag_->set_color("tick-time", diagnostics::color(0.1f, 0.7f, 0.8f));    \r
 \r
                CASPAR_LOG(info) << print() << " Successfully Initialized.";\r
@@ -100,14 +98,8 @@ public:
                \r
                // Consume\r
 \r
-               frame_timer_.restart();\r
-\r
                consumer_->execute(finished_frame);\r
                \r
-               diag_->update_value("consume-time", frame_timer_.elapsed()*context_.get_format_desc().fps*0.5);\r
-               \r
-               // Next\r
-\r
                diag_->update_value("tick-time", tick_timer_.elapsed()*context_.get_format_desc().fps*0.5);\r
                tick_timer_.restart();\r
 \r

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index e6b49c21fb7bdf8e6be4224e6882d6d7542fa830..abce789a0e4ac538f51480b47f75708de084e13e 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -111,7 +111,7 @@ public:
                , bmp_(format_desc_.width, format_desc_.height)\r
        {\r
                graph_->add_guide("frame-time", 0.5f);\r
-               graph_->set_color("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f));  \r
+               graph_->set_color("frame-time", diagnostics::color(0.8f, 0.3f, 0.4f));  \r
                graph_->add_guide("tick-time", 0.5);\r
                graph_->set_color("tick-time", diagnostics::color(0.1f, 0.7f, 0.8f));\r
                graph_->set_color("param", diagnostics::color(1.0f, 0.5f, 0.0f));       \r