2.0. - blend_modes are re-enabled.

[casparcg] / core / video_channel.cpp

diff --git a/core/video_channel.cpp b/core/video_channel.cpp
index 45d3b9158ac364ccea7ce41f347fdac65d73545c..23c1f16e4b0a471e54b7688b371dd26bb9089c0e 100644 (file)
--- a/core/video_channel.cpp
+++ b/core/video_channel.cpp
@@ -63,9 +63,9 @@ public:
        {\r
                diag_->add_guide("produce-time", 0.5f); \r
                diag_->set_color("produce-time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
-               diag_->set_color("mix-time", diagnostics::color(1.0f, 0.0f, 1.0f));\r
-               diag_->set_color("output-time", diagnostics::color(1.0f, 1.0f, 0.0f));\r
                diag_->set_color("tick-time", diagnostics::color(0.1f, 0.7f, 0.8f));    \r
+               diag_->set_color("output-time", diagnostics::color(1.0f, 0.5f, 0.0f));\r
+               diag_->set_color("mix-time", diagnostics::color(0.0f, 1.0f, 0.0f));\r
 \r
                CASPAR_LOG(info) << print() << " Successfully Initialized.";\r
                context_.execution().begin_invoke([this]{tick();});\r
@@ -118,6 +118,7 @@ public:
                        CASPAR_LOG(error) << context_.print() << L" Unexpected exception. Clearing stage and freeing memory";\r
                        stage_->clear();\r
                        context_.ogl().gc().wait();\r
+                       mixer_ = make_safe<caspar::core::mixer>(context_);\r
                }\r
 \r
                context_.execution().begin_invoke([this]{tick();});\r