From: ronag Date: Fri, 6 May 2011 22:47:26 +0000 (+0000) Subject: 2.0.0.2: X-Git-Tag: 2.0.1~609 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ceb9adee0ab86fbc991c3f4a8f0ce1b0fa0a6c16;p=casparcg 2.0.0.2: - Change project compilation settings. - ogl_consumer: No longer blocks frame rendering pipeline. git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@684 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- diff --git a/common/common.vcxproj b/common/common.vcxproj index 4432c2f0d..9007bee22 100644 --- a/common/common.vcxproj +++ b/common/common.vcxproj @@ -187,7 +187,7 @@ Async StreamingSIMDExtensions2 true - AnySuitable + Disabled Speed true false diff --git a/common/compiler/vs/disable_silly_warnings.h b/common/compiler/vs/disable_silly_warnings.h index a1ebe2d78..095e4826d 100644 --- a/common/compiler/vs/disable_silly_warnings.h +++ b/common/compiler/vs/disable_silly_warnings.h @@ -29,5 +29,6 @@ #pragma warning (disable : 4512) // assignment operator could not be generated #pragma warning (disable : 4702) // unreachable code #pragma warning (disable : 4714) // marked as __forceinline not inlined +#pragma warning (disable : 4505) // unreferenced local function has been removed #endif diff --git a/core/core.vcxproj b/core/core.vcxproj index c2aae767d..01b1aec25 100644 --- a/core/core.vcxproj +++ b/core/core.vcxproj @@ -217,7 +217,7 @@ Disabled - AnySuitable + Disabled true Speed ../;%(AdditionalIncludeDirectories) diff --git a/modules/bluefish/bluefish.vcxproj b/modules/bluefish/bluefish.vcxproj index a562e8af3..8d12be077 100644 --- a/modules/bluefish/bluefish.vcxproj +++ b/modules/bluefish/bluefish.vcxproj @@ -209,7 +209,7 @@ Disabled - AnySuitable + Disabled true Speed ../;%(AdditionalIncludeDirectories) diff --git a/modules/decklink/decklink.vcxproj b/modules/decklink/decklink.vcxproj index febe37dd9..52672adc2 100644 --- a/modules/decklink/decklink.vcxproj +++ b/modules/decklink/decklink.vcxproj @@ -193,7 +193,7 @@ Disabled - AnySuitable + Disabled true Speed ../;%(AdditionalIncludeDirectories) diff --git a/modules/ffmpeg/ffmpeg.vcxproj b/modules/ffmpeg/ffmpeg.vcxproj index 2dd810910..8730803ab 100644 --- a/modules/ffmpeg/ffmpeg.vcxproj +++ b/modules/ffmpeg/ffmpeg.vcxproj @@ -217,7 +217,7 @@ Disabled - AnySuitable + Disabled true Speed ../;%(AdditionalIncludeDirectories) diff --git a/modules/flash/flash.vcxproj b/modules/flash/flash.vcxproj index eafa30d9b..460b06188 100644 --- a/modules/flash/flash.vcxproj +++ b/modules/flash/flash.vcxproj @@ -193,7 +193,7 @@ Disabled - AnySuitable + Disabled true Speed ../;%(AdditionalIncludeDirectories) diff --git a/modules/image/image.vcxproj b/modules/image/image.vcxproj index 0061564aa..2e1c8bde9 100644 --- a/modules/image/image.vcxproj +++ b/modules/image/image.vcxproj @@ -193,7 +193,7 @@ Disabled - AnySuitable + Disabled true Speed ../;%(AdditionalIncludeDirectories) diff --git a/modules/oal/oal.vcxproj b/modules/oal/oal.vcxproj index 468867c43..b9ddfc4ee 100644 --- a/modules/oal/oal.vcxproj +++ b/modules/oal/oal.vcxproj @@ -193,7 +193,7 @@ Disabled - AnySuitable + Disabled true Speed ../;%(AdditionalIncludeDirectories) diff --git a/modules/ogl/consumer/ogl_consumer.cpp b/modules/ogl/consumer/ogl_consumer.cpp index e52674152..cd2634601 100644 --- a/modules/ogl/consumer/ogl_consumer.cpp +++ b/modules/ogl/consumer/ogl_consumer.cpp @@ -46,7 +46,6 @@ namespace caspar { struct ogl_consumer::implementation : boost::noncopyable { - boost::timer clock_; boost::unique_future active_; float width_; @@ -81,6 +80,7 @@ public: , graph_(diagnostics::create_graph(narrow(print()))) , executor_(print()) { + executor_.set_capacity(3); graph_->add_guide("frame-time", 0.5); graph_->set_color("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f)); } @@ -177,7 +177,6 @@ public: glBufferDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, format_desc_.size, 0, GL_STREAM_DRAW_ARB); glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0); }); - active_ = executor_.begin_invoke([]{}); CASPAR_LOG(info) << print() << " Sucessfully initialized."; } @@ -272,8 +271,10 @@ public: void send(const safe_ptr& frame) { - active_.get(); - active_ = executor_.begin_invoke([=] + if(executor_.size() >= executor_.capacity()-1) + return; + + executor_.begin_invoke([=] { perf_timer_.restart(); sf::Event e; diff --git a/modules/ogl/ogl.vcxproj b/modules/ogl/ogl.vcxproj index 7fbe3e797..e9c1b3704 100644 --- a/modules/ogl/ogl.vcxproj +++ b/modules/ogl/ogl.vcxproj @@ -217,7 +217,7 @@ Disabled - AnySuitable + Disabled true Speed ../;%(AdditionalIncludeDirectories) diff --git a/modules/silverlight/silverlight.vcxproj b/modules/silverlight/silverlight.vcxproj index 89e8e2d5c..acb7ba49a 100644 --- a/modules/silverlight/silverlight.vcxproj +++ b/modules/silverlight/silverlight.vcxproj @@ -193,7 +193,7 @@ Disabled - AnySuitable + Disabled true Speed ../;%(AdditionalIncludeDirectories) diff --git a/protocol/protocol.vcxproj b/protocol/protocol.vcxproj index f76a898e7..072ade50a 100644 --- a/protocol/protocol.vcxproj +++ b/protocol/protocol.vcxproj @@ -269,6 +269,7 @@ Async common/compiler/vs/disable_silly_warnings.h true + Disabled Windows diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj index 695b53cd3..fb194c6a2 100644 --- a/shell/shell.vcxproj +++ b/shell/shell.vcxproj @@ -321,9 +321,9 @@ copy "$(ProjectDir)caspar.config" "$(OutDir)" Disabled - AnySuitable + Disabled true - Neither + Speed ../ Async MultiThreadedDLL