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

diff --git a/core/consumer/output.cpp b/core/consumer/output.cpp
index 8f13eebd8e296f50056f265f27259495859042d6..8c07ceff5010f78be8b3668c5854fc9f595ee75c 100644 (file)
--- a/core/consumer/output.cpp
+++ b/core/consumer/output.cpp
@@ -35,8 +35,6 @@
 #include <common/utility/timer.h>\r
 #include <common/memory/memshfl.h>\r
 \r
-#include <tbb/mutex.h>\r
-\r
 #include <concrt_extras.h>\r
 \r
 using namespace Concurrency;\r

diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index b82d903e08ff7e3f91790a6eb95a14f68eef0288..798a144263cca882950de7a25c1a1bc36c1167ee 100644 (file)
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -24,12 +24,8 @@
 #include <core/mixer/write_frame.h>\r
 #include <core/producer/frame/frame_transform.h>\r
 \r
-#include <tbb/parallel_for.h>\r
-\r
-#include <safeint.h>\r
-\r
 #include <stack>\r
-#include <deque>\r
+#include <vector>\r
 \r
 namespace caspar { namespace core {\r
 \r
@@ -98,8 +94,6 @@ public:
 \r
                std::map<const void*, core::frame_transform> next_frame_transforms;\r
                \r
-               tbb::affinity_partitioner ap;\r
-\r
                BOOST_FOREACH(auto& item, items)\r
                {                       \r
                        const auto next = item.transform;\r

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index 6c85e7e1359642bc717593219cfcc1e1c9bbc426..50e61b328338df93ca00f726ab4b2e6e0e221a8a 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -28,9 +28,7 @@
 #include "separated/separated_producer.h"\r
 \r
 #include <common/memory/safe_ptr.h>\r
-#include <common/concurrency/executor.h>\r
 #include <common/exception/exceptions.h>\r
-#include <common/utility/move_on_copy.h>\r
 \r
 #include <concrt_extras.h>\r
 \r