From d2d5e7de5eb887ea9ceee75b936baa86ccf1e567 Mon Sep 17 00:00:00 2001 From: hellgore Date: Tue, 25 Sep 2012 14:06:43 +0000 Subject: [PATCH] git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3364 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- core/consumer/output.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/core/consumer/output.cpp b/core/consumer/output.cpp index 9e7a0d909..4c3647ef4 100644 --- a/core/consumer/output.cpp +++ b/core/consumer/output.cpp @@ -191,8 +191,7 @@ public: std::map> send_results; // Start invocations - auto it = consumers_.begin(); - while(it != consumers_.end()) + for (auto it = consumers_.begin(); it != consumers_.end(); ++it) { auto consumer = it->second; auto frame = frames_.at(consumer->buffer_depth()-minmax.first); @@ -215,13 +214,10 @@ public: consumers_.erase(it); } } - - ++it; } // Retrieve results - auto result_it = send_results.begin(); - while(result_it != send_results.end()) + for (auto result_it = send_results.begin(); result_it != send_results.end(); ++result_it) { auto consumer = consumers_.at(result_it->first); auto frame = frames_.at(consumer->buffer_depth()-minmax.first); @@ -254,8 +250,6 @@ public: consumers_.erase(result_it->first); } } - - ++result_it; } graph_->set_value("consume-time", consume_timer_.elapsed()*format_desc_.fps*0.5); -- 2.39.2