2.0. Header optimizations.

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

diff --git a/modules/decklink/StdAfx.h b/modules/decklink/StdAfx.h
index ed0c0c00e1fd46af6f07aacba44084fd6694f40c..fb6112a10231a992651aacc6e12a7d9a3f9e95ad 100644 (file)
--- a/modules/decklink/StdAfx.h
+++ b/modules/decklink/StdAfx.h
@@ -17,11 +17,6 @@
 *    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
 *\r
 */\r
- \r
-// stdafx.h : include file for standard system include files,\r
-//  or project specific include files that are used frequently, but\r
-//      are changed infrequently\r
-//\r
 \r
 #pragma once\r
 \r
@@ -33,33 +28,29 @@
 \r
 #include <Windows.h>\r
 \r
-#include <memory>\r
-#include <array>\r
-#include <functional>\r
 #include <algorithm>\r
-#include <vector>\r
+#include <array>\r
+#include <assert.h>\r
 #include <deque>\r
+#include <functional>\r
+#include <math.h>\r
+#include <memory>\r
 #include <queue>\r
 #include <string>\r
-#include <math.h>\r
+#include <vector>\r
 \r
 #include <tbb/atomic.h>\r
 #include <tbb/concurrent_queue.h>\r
-#include <tbb/parallel_invoke.h>\r
-#include <tbb/parallel_for.h>\r
-#include <tbb/parallel_for_each.h>\r
 \r
 #include <boost/assign.hpp>\r
 #include <boost/filesystem.hpp>\r
 #include <boost/foreach.hpp>\r
 #include <boost/range/algorithm.hpp>\r
 \r
-#include "../common/utility/string.h"\r
 #include "../common/memory/safe_ptr.h"\r
+#include "../common/utility/string.h"\r
 //#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
 \r
-#include "../common/log/Log.h"\r
 #include "../common/exception/exceptions.h"\r
 #include "../common/exception/win32_exception.h"\r
-\r
-#include <assert.h>
\ No newline at end of file
+#include "../common/log/Log.h"\r

diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp
index e59699a012c9b5605e73ac96a407118ccbc19e50..a582fcd0bde5bddd7fef215abe2d0b884afbcb33 100644 (file)
--- a/modules/decklink/producer/decklink_producer.cpp
+++ b/modules/decklink/producer/decklink_producer.cpp
@@ -29,6 +29,7 @@
 #include "../../ffmpeg/producer/util.h"\r
 #include "../../ffmpeg/producer/frame_muxer.h"\r
 \r
+#include <common/log/log.h>\r
 #include <common/diagnostics/graph.h>\r
 #include <common/concurrency/com_context.h>\r
 #include <common/exception/exceptions.h>\r
@@ -41,6 +42,7 @@
 #include <tbb/concurrent_queue.h>\r
 \r
 #include <boost/algorithm/string.hpp>\r
+#include <boost/foreach.hpp>\r
 #include <boost/timer.hpp>\r
 \r
 #if defined(_MSC_VER)\r

diff --git a/modules/decklink/util/util.h b/modules/decklink/util/util.h
index 9321a7781072cb29416b441e616866168bd3a33d..349ca14ff818138061577875ed31602431b2daec 100644 (file)
--- a/modules/decklink/util/util.h
+++ b/modules/decklink/util/util.h
@@ -20,12 +20,17 @@
 #pragma once\r
 \r
 #include <common/exception/exceptions.h>\r
+#include <common/log/log.h>\r
 #include <core/video_format.h>\r
 \r
 #include "../interop/DeckLinkAPI_h.h"\r
 \r
+#include <boost/lexical_cast.hpp>\r
+\r
 #include <atlbase.h>\r
 \r
+#include <string>\r
+\r
 namespace caspar { \r
        \r
 static BMDDisplayMode get_decklink_video_format(core::video_format::type fmt) \r