From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Sat, 22 Oct 2011 22:58:26 +0000 (+0000)
Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... 
X-Git-Tag: 2.1.0_Beta1~1205
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=28fe9588185efeaaa5a7af1a2442b726cb87bf81;p=casparcg

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0 concrt-experimental@1389 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d
---

diff --git a/core/consumer/output.cpp b/core/consumer/output.cpp
index 8f13eebd8..8c07ceff5 100644
--- a/core/consumer/output.cpp
+++ b/core/consumer/output.cpp
@@ -35,8 +35,6 @@
 #include <common/utility/timer.h>
 #include <common/memory/memshfl.h>
 
-#include <tbb/mutex.h>
-
 #include <concrt_extras.h>
 
 using namespace Concurrency;
diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index b82d903e0..798a14426 100644
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -24,12 +24,8 @@
 #include <core/mixer/write_frame.h>
 #include <core/producer/frame/frame_transform.h>
 
-#include <tbb/parallel_for.h>
-
-#include <safeint.h>
-
 #include <stack>
-#include <deque>
+#include <vector>
 
 namespace caspar { namespace core {
 
@@ -98,8 +94,6 @@ public:
 
 		std::map<const void*, core::frame_transform> next_frame_transforms;
 		
-		tbb::affinity_partitioner ap;
-
 		BOOST_FOREACH(auto& item, items)
 		{			
 			const auto next = item.transform;
diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index 6c85e7e13..50e61b328 100644
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -28,9 +28,7 @@
 #include "separated/separated_producer.h"
 
 #include <common/memory/safe_ptr.h>
-#include <common/concurrency/executor.h>
 #include <common/exception/exceptions.h>
-#include <common/utility/move_on_copy.h>
 
 #include <concrt_extras.h>