git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

[casparcg] / core / producer / stage.cpp

diff --git a/core/producer/stage.cpp b/core/producer/stage.cpp
index 14a284141cb73b7ca7e7ff485a79cea98c279ea8..f5ee6d1ff47d5bd426385c3153a55c11578f5baf 100644 (file)
--- a/core/producer/stage.cpp
+++ b/core/producer/stage.cpp
@@ -56,7 +56,6 @@ struct stage::impl : public std::enable_shared_from_this<impl>
 public:\r
        impl(spl::shared_ptr<diagnostics::graph> graph) \r
                : graph_(std::move(graph))\r
-               , event_subject_(new monitor::subject("stage"))\r
                , executor_(L"stage")\r
        {\r
                graph_->set_color("produce-time", diagnostics::color(0.0f, 1.0f, 0.0f));\r
@@ -90,6 +89,7 @@ public:
                        }       \r
                        \r
                        graph_->set_value("produce-time", frame_timer.elapsed()*format_desc.fps*0.5);\r
+                       *event_subject_ << monitor::event("profiler/time") % frame_timer.elapsed() % (1.0/format_desc.fps);\r
 \r
                        return frames;\r
                });\r
@@ -113,14 +113,14 @@ public:
 \r
                auto frame = layer.receive(flags, format_desc); \r
                                \r
-               auto frame1 = spl::make_shared<core::draw_frame>(frame);\r
-               frame1->get_frame_transform() = transform;\r
+               frame = spl::make_shared<core::draw_frame>(frame);\r
+               frame->get_frame_transform() = transform;\r
 \r
                if(format_desc.field_mode != core::field_mode::progressive)\r
                {                               \r
                        auto frame2 = spl::make_shared<core::draw_frame>(frame);\r
                        frame2->get_frame_transform() = tween.fetch_and_tick(1);\r
-                       frame1 = core::draw_frame::interlace(frame1, frame2, format_desc.field_mode);\r
+                       frame = core::draw_frame::interlace(frame, frame2, format_desc.field_mode);\r
                }\r
 \r
                frames[index] = frame;\r