2.0. Updated graphs.

[casparcg] / modules / bluefish / consumer / bluefish_consumer.cpp

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index bd1e0063f65211e85f781596e6a5fc12970dcd14..a25ab8baf7793ca49a88b87a719f476bb9554c9f 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -32,6 +32,8 @@
 #include <common/memory/memclr.h>\r
 #include <common/utility/timer.h>\r
 \r
+#include <core/consumer/frame_consumer.h>\r
+\r
 #include <tbb/concurrent_queue.h>\r
 \r
 #include <boost/timer.hpp>\r
@@ -75,11 +77,11 @@ public:
                , embedded_audio_(embedded_audio)\r
                , executor_(print())\r
        {\r
-               executor_.set_capacity(CONSUMER_BUFFER_DEPTH);\r
+               executor_.set_capacity(core::consumer_buffer_depth());\r
 \r
                graph_ = diagnostics::create_graph(narrow(print()));\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("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f));   \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("sync-time", diagnostics::color(0.5f, 1.0f, 0.2f));\r
@@ -156,18 +158,18 @@ public:
 \r
        ~bluefish_consumer()\r
        {\r
-               //try\r
-               //{\r
-               //      executor_.invoke([&]\r
-               //      {\r
-               //              disable_video_output();\r
-               //              blue_->device_detach();         \r
-               //      });\r
-               //}\r
-               //catch(...)\r
-               //{\r
-               //      CASPAR_LOG_CURRENT_EXCEPTION();\r
-               //}\r
+               try\r
+               {\r
+                       executor_.invoke([&]\r
+                       {\r
+                               disable_video_output();\r
+                               blue_->device_detach();         \r
+                       });\r
+               }\r
+               catch(...)\r
+               {\r
+                       CASPAR_LOG_CURRENT_EXCEPTION();\r
+               }\r
                \r
                CASPAR_LOG(info) << print() << L" Shutting down.";      \r
        }\r
@@ -321,9 +323,10 @@ public:
                consumer_.reset(new bluefish_consumer(format_desc, device_index_, embedded_audio_));\r
        }\r
        \r
-       virtual void send(const safe_ptr<core::read_frame>& frame)\r
+       virtual bool send(const safe_ptr<core::read_frame>& frame)\r
        {\r
                consumer_->send(frame);\r
+               return true;\r
        }\r
 \r
        virtual const core::video_format_desc& get_video_format_desc() const\r