From 3b2747a088549892aaf37a749dd9455fd027862e Mon Sep 17 00:00:00 2001 From: ronag Date: Tue, 7 Jun 2011 12:19:50 +0000 Subject: [PATCH] 2.0.0.2: Cleanup git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@854 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- core/consumer/output.cpp | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/core/consumer/output.cpp b/core/consumer/output.cpp index 9ae7f56f6..96c4c4ad1 100644 --- a/core/consumer/output.cpp +++ b/core/consumer/output.cpp @@ -36,8 +36,6 @@ #include #include -#include - namespace caspar { namespace core { struct output::implementation @@ -53,19 +51,8 @@ struct output::implementation public: implementation(video_channel_context& video_channel) - : channel_(video_channel) - { - } - - std::pair buffer_depth() - { - auto depth_comp = [](const layer_t& lhs, const layer_t& rhs){ return lhs.second->buffer_depth() < rhs.second->buffer_depth(); }; - auto min = std::min_element(consumers_.begin(), consumers_.end(), depth_comp)->second->buffer_depth(); - auto max = std::max_element(consumers_.begin(), consumers_.end(), depth_comp)->second->buffer_depth(); - CASPAR_ASSERT(max >= min); - return std::make_pair(min, max); - } - + : channel_(video_channel){} + void add(int index, safe_ptr&& consumer) { consumer->initialize(channel_.get_format_desc()); @@ -161,15 +148,13 @@ private: return make_safe(); } - std::wstring print() const { return L"output"; } }; -output::output(video_channel_context& video_channel) - : impl_(new implementation(video_channel)){} +output::output(video_channel_context& video_channel) : impl_(new implementation(video_channel)){} void output::add(int index, safe_ptr&& consumer){impl_->add(index, std::move(consumer));} void output::remove(int index){impl_->remove(index);} void output::execute(const safe_ptr& frame) {impl_->execute(frame); } -- 2.39.2