2.1.0: -common: Restructured files. Moved most files into root for easier inclusion...

       -enum_class: Added comparison against ints.

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

diff --git a/accelerator/StdAfx.h b/accelerator/StdAfx.h
index 92f9c398fb8cf74a0f8437c039e75c1c7e15329a..ff33505b0b99c5d3d2d50199b6259984d254bcbd 100644 (file)
--- a/accelerator/StdAfx.h
+++ b/accelerator/StdAfx.h
@@ -58,8 +58,8 @@
 \r
 #include <common/assert.h>\r
 #include <common/utf.h>\r
-#include <common/spl/memory.h>\r
-//#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
+#include <common/memory.h>\r
+//#include "../common/executor.h" // Can't include this due to MSVC lambda bug\r
 \r
 #include <common/log.h>\r
 #include <common/except.h>\r

diff --git a/accelerator/accelerator.h b/accelerator/accelerator.h
index 74a6fb593bf44f88423bd7f1b370401bd2b206f5..a54595cd62c7774882f329e2561421f456def0a7 100644 (file)
--- a/accelerator/accelerator.h
+++ b/accelerator/accelerator.h
@@ -1,7 +1,7 @@
 #pragma once\r
 \r
 #include <common/forward.h>\r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <core/mixer/image/image_mixer.h>\r
 \r

diff --git a/accelerator/cpu/image/image_mixer.cpp b/accelerator/cpu/image/image_mixer.cpp
index 24659c1a7667e6b769869a1e7f4ea2f1e824246c..c4722b37cfcf6cd22c4baf7c6f085185baee3c12 100644 (file)
--- a/accelerator/cpu/image/image_mixer.cpp
+++ b/accelerator/cpu/image/image_mixer.cpp
@@ -27,8 +27,8 @@
 \r
 #include <common/assert.h>\r
 #include <common/gl/gl_check.h>\r
-#include <common/concurrency/async.h>\r
-#include <common/memory/array.h>\r
+#include <common/future.h>\r
+#include <common/array.h>\r
 \r
 #include <core/frame/frame.h>\r
 #include <core/frame/frame_transform.h>\r

diff --git a/accelerator/cpu/image/image_mixer.h b/accelerator/cpu/image/image_mixer.h
index 21fe8fd6aa5d4acc36fb80acdf5302a17922f4b2..db93965fc73880bb5224e4137fd3a8c02a3f2a43 100644 (file)
--- a/accelerator/cpu/image/image_mixer.h
+++ b/accelerator/cpu/image/image_mixer.h
@@ -1,7 +1,7 @@
 #pragma once\r
 \r
 #include <common/forward.h>\r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <core/mixer/image/blend_modes.h>\r
 #include <core/mixer/image/image_mixer.h>\r

diff --git a/accelerator/ogl/image/image_kernel.h b/accelerator/ogl/image/image_kernel.h
index 37def871ccf164ca3db8eb51efeea7cc623b7c65..58e20780c853c2d97571efbae4dee72c134fdcd8 100644 (file)
--- a/accelerator/ogl/image/image_kernel.h
+++ b/accelerator/ogl/image/image_kernel.h
@@ -24,7 +24,7 @@
 #include <core/mixer/image/blend_modes.h>\r
 \r
 #include <common/enum_class.h>\r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <core/frame/pixel_format.h>\r
 #include <core/frame/frame_transform.h>\r

diff --git a/accelerator/ogl/image/image_mixer.cpp b/accelerator/ogl/image/image_mixer.cpp
index 7c2a9830124fe95fcc37772bb521ac0a86a5846b..54cd9392432868800a0ef0138fe5c9193699026b 100644 (file)
--- a/accelerator/ogl/image/image_mixer.cpp
+++ b/accelerator/ogl/image/image_mixer.cpp
@@ -29,8 +29,8 @@
 #include "../util/texture.h"\r
 \r
 #include <common/gl/gl_check.h>\r
-#include <common/concurrency/async.h>\r
-#include <common/memory/array.h>\r
+#include <common/future.h>\r
+#include <common/array.h>\r
 \r
 #include <core/frame/frame.h>\r
 #include <core/frame/frame_transform.h>\r

diff --git a/accelerator/ogl/image/image_mixer.h b/accelerator/ogl/image/image_mixer.h
index 4e5b46e11e8f5fc6f704717dbcb0ca98748e3fda..950af6b6df1f43225e8ca78cebb9fbfad2f818f7 100644 (file)
--- a/accelerator/ogl/image/image_mixer.h
+++ b/accelerator/ogl/image/image_mixer.h
@@ -22,7 +22,8 @@
 #pragma once\r
 \r
 #include <common/forward.h>\r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
+#include <common/future_fwd.h>\r
 \r
 #include <core/mixer/image/blend_modes.h>\r
 #include <core/mixer/image/image_mixer.h>\r
@@ -30,7 +31,6 @@
 #include <core/frame/frame_visitor.h>\r
 #include <core/video_format.h>\r
 \r
-FORWARD1(boost, template<typename> class unique_future);\r
 FORWARD2(caspar, core, class frame);\r
 FORWARD2(caspar, core, struct pixel_format_desc);\r
 FORWARD2(caspar, core, struct video_format_desc);\r

diff --git a/accelerator/ogl/image/image_shader.h b/accelerator/ogl/image/image_shader.h
index f9b2c9f718a491fa5e522cbb223c6d1ae9fe40c5..952f0716805731d453307c6a39c8f64eb5e39dbc 100644 (file)
--- a/accelerator/ogl/image/image_shader.h
+++ b/accelerator/ogl/image/image_shader.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 namespace caspar { namespace accelerator { namespace ogl {\r
 \r

diff --git a/accelerator/ogl/util/buffer.h b/accelerator/ogl/util/buffer.h
index 7fcdb8ea6ed92843dddd5ec7d611b946deb69b41..c60a0c0fa935a56c65a97b1421bb2fb86b76969f 100644 (file)
--- a/accelerator/ogl/util/buffer.h
+++ b/accelerator/ogl/util/buffer.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 #include <common/enum_class.h>\r
 \r
 #include <cstdint>\r

diff --git a/accelerator/ogl/util/device.cpp b/accelerator/ogl/util/device.cpp
index 248191ff2192bc42d29ed2d87354e0dd61ac8eaa..a54a8c9459fa9a1abb0995f55bf263d34076c3a7 100644 (file)
--- a/accelerator/ogl/util/device.cpp
+++ b/accelerator/ogl/util/device.cpp
@@ -31,8 +31,8 @@
 \r
 #include <common/assert.h>\r
 #include <common/except.h>\r
-#include <common/concurrency/async.h>\r
-#include <common/memory/array.h>\r
+#include <common/future.h>\r
+#include <common/array.h>\r
 #include <common/gl/gl_check.h>\r
 #include <common/os/windows/windows.h>\r
 \r

diff --git a/accelerator/ogl/util/device.h b/accelerator/ogl/util/device.h
index f41cc56a1f340e4c5f29d413536c789aec352e32..baf35add3cdda129c3424bd99b373c8ae14220ec 100644 (file)
--- a/accelerator/ogl/util/device.h
+++ b/accelerator/ogl/util/device.h
@@ -23,8 +23,8 @@
 \r
 #include <core/frame/frame.h>\r
 \r
-#include <common/spl/memory.h>\r
-#include <common/concurrency/executor.h>\r
+#include <common/memory.h>\r
+#include <common/executor.h>\r
 \r
 namespace caspar { namespace accelerator { namespace ogl {\r
 \r

diff --git a/accelerator/ogl/util/shader.h b/accelerator/ogl/util/shader.h
index 7b02ffa44ccab0520ad418672c0d0cc36257e806..e5a54376c03eb19a1fda1242638816b528516e10 100644 (file)
--- a/accelerator/ogl/util/shader.h
+++ b/accelerator/ogl/util/shader.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <string>\r
 \r

diff --git a/accelerator/ogl/util/texture.h b/accelerator/ogl/util/texture.h
index 3793bdc12fd82c812dcc158b690686f44bba0c05..78fd008c4623474115a70b92faa1b6a9b5ebdae5 100644 (file)
--- a/accelerator/ogl/util/texture.h
+++ b/accelerator/ogl/util/texture.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <cstddef>\r
 \r

diff --git a/common/memory/array.h b/common/array.h
similarity index 91%
rename from common/memory/array.h
rename to common/array.h
index b283e276de36e27e432608c59dc51975577e1c04..44fae1bcbdfbe122898154f23bb82eed7c52c30d 100644 (file)
--- a/common/memory/array.h
+++ b/common/array.h
@@ -1,15 +1,13 @@
 #pragma once\r
 \r
-#include "../spl/memory.h"\r
-#include "../forward.h"\r
+#include "memory.h"\r
+#include "forward.h"\r
 \r
 #include <boost/any.hpp>\r
 \r
 #include <cstddef>\r
 #include <cstdint>\r
 \r
-FORWARD1(boost, template<typename> class shared_future);\r
-\r
 namespace caspar {\r
        \r
 template<typename T>\r

diff --git a/common/common.vcxproj b/common/common.vcxproj
index 602e803756829061871377d920a1ac838b9eba75..a74e46997a197e26c6d6b40c5744788bc343ed55 100644 (file)
--- a/common/common.vcxproj
+++ b/common/common.vcxproj
@@ -119,79 +119,55 @@
     </Lib>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
+    <ClInclude Include="array.h" />\r
     <ClInclude Include="assert.h" />\r
     <ClInclude Include="compiler\vs\disable_silly_warnings.h" />\r
-    <ClInclude Include="concurrency\async.h" />\r
-    <ClInclude Include="concurrency\executor.h" />\r
-    <ClInclude Include="concurrency\lock.h" />\r
     <ClInclude Include="diagnostics\graph.h" />\r
+    <ClInclude Include="enum_class.h" />\r
+    <ClInclude Include="env.h" />\r
     <ClInclude Include="except.h" />\r
+    <ClInclude Include="executor.h" />\r
     <ClInclude Include="forward.h" />\r
+    <ClInclude Include="future.h" />\r
+    <ClInclude Include="future_fwd.h" />\r
     <ClInclude Include="gl\gl_check.h" />\r
+    <ClInclude Include="lock.h" />\r
     <ClInclude Include="log.h" />\r
-    <ClInclude Include="memory\array.h" />\r
-    <ClInclude Include="memory\memcpy.h" />\r
-    <ClInclude Include="memory\memshfl.h" />\r
-    <ClInclude Include="memory\page_locked_allocator.h" />\r
-    <ClInclude Include="env.h" />\r
+    <ClInclude Include="memory.h" />\r
+    <ClInclude Include="memshfl.h" />\r
     <ClInclude Include="os\windows\current_version.h" />\r
     <ClInclude Include="os\windows\system_info.h" />\r
-    <ClInclude Include="enum_class.h" />\r
     <ClInclude Include="os\windows\windows.h" />\r
+    <ClInclude Include="page_locked_allocator.h" />\r
     <ClInclude Include="param.h" />\r
+    <ClInclude Include="prec_timer.h" />\r
     <ClInclude Include="reactive.h" />\r
-    <ClInclude Include="spl\memory.h" />\r
     <ClInclude Include="stdafx.h" />\r
     <ClInclude Include="tweener.h" />\r
     <ClInclude Include="utf.h" />\r
-    <ClInclude Include="prec_timer.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="diagnostics\graph.cpp">\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../StdAfx.h</PrecompiledHeaderFile>\r
     </ClCompile>\r
+    <ClCompile Include="env.cpp" />\r
     <ClCompile Include="except.cpp" />\r
     <ClCompile Include="gl\gl_check.cpp">\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../StdAfx.h</PrecompiledHeaderFile>\r
     </ClCompile>\r
     <ClCompile Include="log.cpp" />\r
-    <ClCompile Include="env.cpp" />\r
-    <ClCompile Include="memory\array.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|x64'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
-    <ClCompile Include="memory\page_locked_allocator.cpp">\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Develop|x64'">Use</PrecompiledHeader>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|x64'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Use</PrecompiledHeader>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
+    <ClCompile Include="page_locked_allocator.cpp" />\r
+    <ClCompile Include="prec_timer.cpp" />\r
     <ClCompile Include="stdafx.cpp">\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Create</PrecompiledHeader>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Develop|x64'">Create</PrecompiledHeader>\r
     </ClCompile>\r
-    <ClCompile Include="tweener.cpp">\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Develop|x64'">Use</PrecompiledHeader>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|x64'">StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Use</PrecompiledHeader>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
+    <ClCompile Include="tweener.cpp" />\r
     <ClCompile Include="utf.cpp" />\r
-    <ClCompile Include="prec_timer.cpp" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r

diff --git a/common/common.vcxproj.filters b/common/common.vcxproj.filters
index c63d03e80c75bd77964327ed3b9628c0fbda9976..20ff6715a2394f681613c22e1201fc4eb4989d3a 100644 (file)
--- a/common/common.vcxproj.filters
+++ b/common/common.vcxproj.filters
@@ -10,27 +10,18 @@
     <Filter Include="source\os\windows">\r
       <UniqueIdentifier>{1f3002ae-ebb8-4195-8cf3-1a5b87822f38}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="source\memory">\r
-      <UniqueIdentifier>{9259676d-c225-4422-a50e-30d152d78dc2}</UniqueIdentifier>\r
-    </Filter>\r
     <Filter Include="source\gl">\r
       <UniqueIdentifier>{0d94bbc2-e196-4618-a90b-19392a3a0a8e}</UniqueIdentifier>\r
     </Filter>\r
     <Filter Include="source\diagnostics">\r
       <UniqueIdentifier>{29a29bcc-a9a0-4083-b713-c3773d18e177}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="source\concurrency">\r
-      <UniqueIdentifier>{644fe2e4-1199-4a0e-8d4c-63cf1ac82f1d}</UniqueIdentifier>\r
-    </Filter>\r
     <Filter Include="source\compiler">\r
       <UniqueIdentifier>{63471750-a430-4167-9b49-31b7a068a913}</UniqueIdentifier>\r
     </Filter>\r
     <Filter Include="source\compiler\vs">\r
       <UniqueIdentifier>{28c25c8a-1277-4d2c-9e85-5af33f9938ea}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="source\spl">\r
-      <UniqueIdentifier>{8b45f3e8-2ab4-4bee-8130-144a7bc795e8}</UniqueIdentifier>\r
-    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="diagnostics\graph.cpp">\r
@@ -40,44 +31,35 @@
     <ClCompile Include="gl\gl_check.cpp">\r
       <Filter>source\gl</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="env.cpp">\r
+    <ClCompile Include="log.cpp">\r
       <Filter>source</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="utf.cpp">\r
+    <ClCompile Include="page_locked_allocator.cpp">\r
       <Filter>source</Filter>\r
     </ClCompile>\r
     <ClCompile Include="prec_timer.cpp">\r
       <Filter>source</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="log.cpp">\r
+    <ClCompile Include="tweener.cpp">\r
       <Filter>source</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="except.cpp">\r
+    <ClCompile Include="utf.cpp">\r
       <Filter>source</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="tweener.cpp">\r
+    <ClCompile Include="env.cpp">\r
       <Filter>source</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="memory\page_locked_allocator.cpp">\r
-      <Filter>source\memory</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="memory\array.cpp">\r
-      <Filter>source\memory</Filter>\r
+    <ClCompile Include="except.cpp">\r
+      <Filter>source</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="compiler\vs\disable_silly_warnings.h">\r
       <Filter>source\compiler\vs</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="concurrency\executor.h">\r
-      <Filter>source\concurrency</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="gl\gl_check.h">\r
       <Filter>source\gl</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="memory\page_locked_allocator.h">\r
-      <Filter>source\memory</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="diagnostics\graph.h">\r
       <Filter>source\diagnostics</Filter>\r
     </ClInclude>\r
@@ -88,59 +70,65 @@
     <ClInclude Include="os\windows\system_info.h">\r
       <Filter>source\os\windows</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="memory\memshfl.h">\r
-      <Filter>source\memory</Filter>\r
+    <ClInclude Include="os\windows\windows.h">\r
+      <Filter>source\os\windows</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="env.h">\r
+    <ClInclude Include="lock.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="concurrency\lock.h">\r
-      <Filter>source\concurrency</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="utf.h">\r
+    <ClInclude Include="log.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="prec_timer.h">\r
+    <ClInclude Include="memory.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="log.h">\r
+    <ClInclude Include="memshfl.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="forward.h">\r
+    <ClInclude Include="page_locked_allocator.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="enum_class.h">\r
+    <ClInclude Include="array.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
     <ClInclude Include="assert.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="os\windows\windows.h">\r
-      <Filter>source\os\windows</Filter>\r
+    <ClInclude Include="enum_class.h">\r
+      <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="reactive.h">\r
+    <ClInclude Include="env.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
     <ClInclude Include="except.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="tweener.h">\r
+    <ClInclude Include="executor.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="concurrency\async.h">\r
-      <Filter>source\concurrency</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="spl\memory.h">\r
-      <Filter>source\spl</Filter>\r
+    <ClInclude Include="forward.h">\r
+      <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="memory\memcpy.h">\r
-      <Filter>source\memory</Filter>\r
+    <ClInclude Include="future.h">\r
+      <Filter>source</Filter>\r
     </ClInclude>\r
     <ClInclude Include="param.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="memory\array.h">\r
-      <Filter>source\memory</Filter>\r
+    <ClInclude Include="prec_timer.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="reactive.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="tweener.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="utf.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="future_fwd.h">\r
+      <Filter>source</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/common/diagnostics/graph.cpp b/common/diagnostics/graph.cpp
index 1de4bb95a2d37c828df0055949d11a3fe2159c84..56f4bb0c6def43004ffdd1b5184d41440c04a3b4 100644 (file)
--- a/common/diagnostics/graph.cpp
+++ b/common/diagnostics/graph.cpp
@@ -25,8 +25,8 @@
 \r
 #pragma warning (disable : 4244)\r
 \r
-#include "../concurrency/executor.h"\r
-#include "../concurrency/lock.h"\r
+#include "../executor.h"\r
+#include "../lock.h"\r
 #include "../env.h"\r
 \r
 #include <SFML/Graphics.hpp>\r

diff --git a/common/diagnostics/graph.h b/common/diagnostics/graph.h
index 39088d43b65069270829e76c0b27d2d8e56167f0..f82491222bba63421697f20fe7d9c32810907854 100644 (file)
--- a/common/diagnostics/graph.h
+++ b/common/diagnostics/graph.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include "../spl/memory.h"\r
+#include "../memory.h"\r
 \r
 #include <string>\r
 #include <tuple>\r

diff --git a/common/enum_class.h b/common/enum_class.h
index 933f7cba169853f17b1cc035ea15f9b4e278d721..564525d8eefe3adbec731cdd250baec5f9399085 100644 (file)
--- a/common/enum_class.h
+++ b/common/enum_class.h
@@ -12,12 +12,19 @@ public:
        enum_class(type v) : val_(v) {}\r
        inner value() const { return val_; }\r
  \r
-       bool operator==(const enum_class& s) const { return val_ == s.val_; }\r
-       bool operator!=(const enum_class& s) const { return val_ != s.val_; }\r
-       bool operator<(const enum_class& s) const { return val_ <  s.val_; }\r
-       bool operator<=(const enum_class& s) const { return val_ <= s.val_; }\r
-       bool operator>(const enum_class& s) const { return val_ >  s.val_; }\r
-       bool operator>=(const enum_class& s) const { return val_ >= s.val_; }\r
+       bool operator==(const enum_class& s) const      { return val_ == s.val_; }\r
+       bool operator!=(const enum_class& s) const      { return val_ != s.val_; }\r
+       bool operator<(const enum_class& s) const       { return val_ <  s.val_; }\r
+       bool operator<=(const enum_class& s) const      { return val_ <= s.val_; }\r
+       bool operator>(const enum_class& s) const       { return val_ >  s.val_; }\r
+       bool operator>=(const enum_class& s) const      { return val_ >= s.val_; }\r
+               \r
+       bool operator==(const int& val) const   { return val_ == val; }\r
+       bool operator!=(const int& val) const   { return val_ != val; }\r
+       bool operator<(const int& val) const    { return val_ <  val; }\r
+       bool operator<=(const int& val) const   { return val_ <= val; }\r
+       bool operator>(const int& val) const    { return val_ >  val; }\r
+       bool operator>=(const int& val) const   { return val_ >= val; }\r
 \r
        enum_class operator&(const enum_class& s) const\r
        {\r

diff --git a/common/concurrency/executor.h b/common/executor.h
similarity index 94%
rename from common/concurrency/executor.h
rename to common/executor.h
index 9c82c63ec1e19cbc0b5f871f29c37c72585d6991..1718a90ac3f177e0e7a4628d43e0be7afa57301b 100644 (file)
--- a/common/concurrency/executor.h
+++ b/common/executor.h
@@ -21,9 +21,9 @@
 \r
 #pragma once\r
 \r
-#include "../except.h"\r
-#include "../enum_class.h"\r
-#include "../log.h"\r
+#include "except.h"\r
+#include "enum_class.h"\r
+#include "log.h"\r
 \r
 #include <tbb/atomic.h>\r
 #include <tbb/concurrent_priority_queue.h>\r

diff --git a/common/concurrency/async.h b/common/future.h
similarity index 83%
rename from common/concurrency/async.h
rename to common/future.h
index a7c7dbbcde610a3b4ce311e46d8cf40720e56a56..85a848cac96b1b4888b6bd8156c69904a808b8af 100644 (file)
--- a/common/concurrency/async.h
+++ b/common/future.h
@@ -1,26 +1,24 @@
 #pragma once\r
 \r
-#include "../enum_class.h"\r
+#include "enum_class.h"\r
 \r
 #include <boost/thread/future.hpp>\r
 #include <boost/thread/thread.hpp>\r
-#include <boost/utility/declval.hpp>\r
+#include <boost/shared_ptr.hpp>\r
 \r
 #include <functional>\r
-#include <memory>\r
-#include <tuple>\r
 \r
 namespace caspar {\r
-\r
+       \r
 struct launch_policy_def\r
 {\r
        enum type\r
        {\r
-               async,\r
-               deferred\r
+               async = 1,\r
+               deferred = 2\r
        };\r
 };\r
-typedef enum_class<launch_policy_def> launch;\r
+typedef caspar::enum_class<launch_policy_def> launch;\r
 \r
 namespace detail {\r
 \r
@@ -94,12 +92,23 @@ struct callback_object<void, F> : public boost::detail::future_object<void>
 }\r
        \r
 template<typename F>\r
-auto async(launch lp, F&& f) -> boost::unique_future<decltype(f())>\r
+auto async(launch policy, F&& f) -> boost::unique_future<decltype(f())>\r
 {              \r
        typedef decltype(f()) result_type;\r
        \r
-       if(lp == launch::deferred)\r
-       {                       \r
+       if((policy & launch::async) != 0)\r
+       {\r
+               typedef boost::packaged_task<result_type> task_t;\r
+\r
+               auto task       = task_t(std::forward<F>(f));   \r
+               auto future = task.get_future();\r
+               \r
+               boost::thread(std::move(task)).detach();\r
+       \r
+               return std::move(future);\r
+       }\r
+       else if((policy & launch::deferred) != 0)\r
+       {               \r
                // HACK: THIS IS A MAYOR HACK!\r
 \r
                typedef boost::detail::future_object<result_type> future_object_t;\r
@@ -115,20 +124,14 @@ auto async(launch lp, F&& f) -> boost::unique_future<decltype(f())>
                }), &dummy);\r
                \r
                boost::unique_future<result_type> future;\r
+\r
+               static_assert(sizeof(future) == sizeof(future_object), "");\r
+\r
                reinterpret_cast<boost::shared_ptr<future_object_t>&>(future) = std::move(future_object); // Get around the "private" encapsulation.\r
                return std::move(future);\r
        }\r
        else\r
-       {\r
-               typedef boost::packaged_task<result_type> task_t;\r
-\r
-               auto task       = task_t(std::forward<F>(f));   \r
-               auto future = task.get_future();\r
-               \r
-               boost::thread(std::move(task)).detach();\r
-       \r
-               return std::move(future);\r
-       }\r
+               throw std::invalid_argument("policy");\r
 }\r
        \r
 template<typename F>\r

diff --git a/common/future_fwd.h b/common/future_fwd.h
new file mode 100644 (file)
index 0000000..ee836ce
--- /dev/null
+++ b/common/future_fwd.h
@@ -0,0 +1,6 @@
+#pragma once\r
+\r
+#include "forward.h"\r
+\r
+FORWARD1(boost, template<typename> class unique_future);\r
+FORWARD1(boost, template<typename> class shared_future);\r

diff --git a/common/concurrency/lock.h b/common/lock.h
similarity index 100%
rename from common/concurrency/lock.h
rename to common/lock.h

diff --git a/common/spl/memory.h b/common/memory.h
similarity index 100%
rename from common/spl/memory.h
rename to common/memory.h

diff --git a/common/memory/array.cpp b/common/memory/array.cpp
deleted file mode 100644 (file)
index 7cb0ab7..0000000
--- a/common/memory/array.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
-*\r
-* This file is part of CasparCG (www.casparcg.com).\r
-*\r
-* CasparCG is free software: you can redistribute it and/or modify\r
-* it under the terms of the GNU General Public License as published by\r
-* the Free Software Foundation, either version 3 of the License, or\r
-* (at your option) any later version.\r
-*\r
-* CasparCG is distributed in the hope that it will be useful,\r
-* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-* GNU General Public License for more details.\r
-*\r
-* You should have received a copy of the GNU General Public License\r
-* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-* Author: Robert Nagy, ronag89@gmail.com\r
-*/\r
-\r
-#include "../stdafx.h"\r
-\r
-#include "array.h"\r
-\r
-#include "../assert.h"\r
-\r
-namespace caspar { namespace core {\r
-\r
-}}
\ No newline at end of file

diff --git a/common/memory/memcpy.h b/common/memory/memcpy.h
deleted file mode 100644 (file)
index 5267d8d..0000000
--- a/common/memory/memcpy.h
+++ /dev/null
@@ -1,107 +0,0 @@
-#pragma once\r
-\r
-#include <intrin.h>\r
-#include <cstdint>\r
-\r
-#include <array>\r
-\r
-#include <tbb/parallel_for.h>\r
-\r
-#include <asmlib.h>\r
-\r
-#if defined(_MSC_VER)\r
-#pragma warning (push)\r
-#pragma warning (disable : 4244)\r
-#endif\r
-extern "C" \r
-{\r
-       #include <libavutil/cpu.h>\r
-}\r
-#if defined(_MSC_VER)\r
-#pragma warning (pop)\r
-#endif\r
-\r
-namespace caspar {\r
-\r
-static bool has_uswc_memcpy()\r
-{\r
-       static bool value = (ff_get_cpu_flags_x86() & AV_CPU_FLAG_SSE4) != 0;\r
-       return value;\r
-}\r
-         \r
-// http://software.intel.com/en-us/articles/copying-accelerated-video-decode-frame-buffers/\r
-static void uswc_memcpy(void* dest, void* source, int count)  \r
-{  \r
-       static const int CACHED_BUFFER_SIZE = 4096;\r
-  \r
-       const int block_count   = count / CACHED_BUFFER_SIZE;\r
-       const int remainder             = count % CACHED_BUFFER_SIZE;\r
-    \r
-       tbb::parallel_for(tbb::blocked_range<int>(0, block_count), [&](const tbb::blocked_range<int>& r)\r
-       {\r
-               __declspec(align(64)) std::array<uint8_t, CACHED_BUFFER_SIZE> cache_block;\r
-\r
-               auto load  = reinterpret_cast<__m128i*>(source)+r.begin()*CACHED_BUFFER_SIZE/16;\r
-               auto store = reinterpret_cast<__m128i*>(dest)+r.begin()*CACHED_BUFFER_SIZE/16;\r
-\r
-               for(int b = r.begin(); b != r.end(); ++b)\r
-               {\r
-                       {\r
-                               _mm_mfence();   \r
-                               auto cache = reinterpret_cast<__m128i*>(cache_block.data());     \r
-\r
-                               for(int n = 0; n < CACHED_BUFFER_SIZE; n += 64)\r
-                               {\r
-                                       auto x0 = _mm_stream_load_si128(load++);  \r
-                                       auto x1 = _mm_stream_load_si128(load++);  \r
-                                       auto x2 = _mm_stream_load_si128(load++);  \r
-                                       auto x3 = _mm_stream_load_si128(load++);  \r
-  \r
-                                       _mm_store_si128(cache++, x0);  \r
-                                       _mm_store_si128(cache++, x1);  \r
-                                       _mm_store_si128(cache++, x2);  \r
-                                       _mm_store_si128(cache++, x3);  \r
-                               }\r
-                       }\r
-                       {\r
-                               _mm_mfence();    \r
-                               auto cache = reinterpret_cast<__m128i*>(cache_block.data());  \r
-                         \r
-                               for(int n = 0; n < CACHED_BUFFER_SIZE; n += 64)\r
-                               {  \r
-                                       auto x0 = _mm_load_si128(cache++);  \r
-                                       auto x1 = _mm_load_si128(cache++);  \r
-                                       auto x2 = _mm_load_si128(cache++);  \r
-                                       auto x3 = _mm_load_si128(cache++);  \r
-  \r
-                                       _mm_stream_si128(store++, x0);  \r
-                                       _mm_stream_si128(store++, x1);  \r
-                                       _mm_stream_si128(store++, x2);  \r
-                                       _mm_stream_si128(store++, x3);   \r
-                               }  \r
-                       }\r
-               }\r
-       });\r
-       \r
-       __declspec(align(64)) std::array<uint8_t, CACHED_BUFFER_SIZE> cache_block;\r
-       \r
-       {\r
-               _mm_mfence(); \r
-               auto cache = reinterpret_cast<__m128i*>(cache_block.data());   \r
-               auto load  = reinterpret_cast<__m128i*>(source)+(count-remainder)/16;\r
-\r
-               for(int n = 0; n < remainder; n += 16)\r
-                       _mm_store_si128(cache++, _mm_stream_load_si128(load++));                \r
-       }\r
-\r
-       {       \r
-               _mm_mfence(); \r
-               auto cache = reinterpret_cast<__m128i*>(cache_block.data());   \r
-               auto store = reinterpret_cast<__m128i*>(dest)+(count-remainder)/16;\r
-\r
-               for(int n = 0; n < remainder; n += 16)\r
-                       _mm_stream_si128(store++, _mm_load_si128(cache++));             \r
-       }\r
-}  \r
-\r
-}
\ No newline at end of file

diff --git a/common/memory/memshfl.h b/common/memshfl.h
similarity index 100%
rename from common/memory/memshfl.h
rename to common/memshfl.h

diff --git a/common/memory/page_locked_allocator.cpp b/common/page_locked_allocator.cpp
similarity index 90%
rename from common/memory/page_locked_allocator.cpp
rename to common/page_locked_allocator.cpp
index 637dc3ddce9b3700026b4993d6d58a581abe246f..c8d0cac608cac892350a885889bdeeb0c590b01f 100644 (file)
--- a/common/memory/page_locked_allocator.cpp
+++ b/common/page_locked_allocator.cpp
@@ -1,6 +1,6 @@
-#include "../stdafx.h"\r
+#include "stdafx.h"\r
 \r
-#include "../os/windows/windows.h"\r
+#include "os/windows/windows.h"\r
 \r
 #include <unordered_map>\r
 #include <tbb/mutex.h>\r

diff --git a/common/memory/page_locked_allocator.h b/common/page_locked_allocator.h
similarity index 100%
rename from common/memory/page_locked_allocator.h
rename to common/page_locked_allocator.h

diff --git a/common/reactive.h b/common/reactive.h
index b4e01e0f01af184576facce7ade623f8e5e794a7..9d0efeed9c5d32d1ea45a806fc008f1617737c45 100644 (file)
--- a/common/reactive.h
+++ b/common/reactive.h
@@ -1,7 +1,7 @@
 #pragma once\r
 \r
-#include "spl/memory.h"\r
-#include "concurrency/lock.h"\r
+#include "memory.h"\r
+#include "lock.h"\r
 \r
 #include <tbb/spin_rw_mutex.h>\r
 #include <tbb/cache_aligned_allocator.h>\r
@@ -55,8 +55,13 @@ class observer
        observer(const observer&);\r
        observer& operator=(const observer&);\r
 public:\r
+\r
+       // Static Members\r
+\r
        typedef T value_type;\r
        \r
+       // Constructors\r
+\r
        observer()\r
        {\r
        }\r
@@ -65,7 +70,11 @@ public:
        {\r
        }\r
 \r
+       // Methods\r
+\r
        virtual void on_next(const T&) = 0;\r
+\r
+       // Properties\r
 };\r
 \r
 template<typename T>\r
@@ -74,9 +83,14 @@ class observable
        observable(const observable&);\r
        observable& operator=(const observable&);\r
 public:\r
+\r
+       // Static Members\r
+\r
        typedef T                                               value_type;\r
        typedef observer<T>                             observer;\r
        typedef std::weak_ptr<observer> observer_ptr;\r
+       \r
+       // Constructors\r
 \r
        observable()\r
        {\r
@@ -85,27 +99,45 @@ public:
        virtual ~observable()\r
        {\r
        }\r
+       \r
+       // Methods\r
 \r
        virtual void subscribe(const observer_ptr&) = 0;\r
        virtual void unsubscribe(const observer_ptr&) = 0;\r
+       \r
+       // Properties\r
 };\r
 \r
 template<typename I, typename O = I>\r
 class subject : public observer<I>, public observable<O>\r
 {\r
 public:\r
+       \r
+       // Static Members\r
+\r
        typedef typename observable<O>::observer                observer;\r
        typedef typename observable<O>::observer_ptr    observer_ptr;\r
+       \r
+       // Constructors\r
 \r
        virtual ~subject()\r
        {\r
        }\r
+       \r
+       // Methods\r
+\r
+       // Properties\r
 };\r
 \r
 template<typename T, typename C>\r
 class observer_function : public observer<T>\r
 {\r
 public:\r
+       \r
+       // Static Members\r
+       \r
+       // Constructors\r
+\r
        observer_function()\r
        {\r
        }\r
@@ -129,6 +161,8 @@ public:
        {\r
                other.swap(*this);\r
        }\r
+               \r
+       // Methods\r
 \r
        void swap(observer_function& other)\r
        {\r
@@ -140,6 +174,8 @@ public:
        {\r
                func_(e);\r
        }\r
+\r
+       // Properties\r
 private:\r
        C func_;\r
 };\r
@@ -152,9 +188,13 @@ class basic_subject_impl sealed : public subject<I, O>
        basic_subject_impl(const basic_subject_impl&);\r
        basic_subject_impl& operator=(const basic_subject_impl&);\r
 public:        \r
+       // Static Members\r
+\r
        typedef typename subject<I, O>::observer                observer;\r
        typedef typename subject<I, O>::observer_ptr    observer_ptr;\r
 \r
+       // Constructors\r
+\r
        basic_subject_impl()\r
        {\r
        }\r
@@ -170,6 +210,8 @@ public:
                return *this;\r
        }\r
 \r
+       // Methods\r
+\r
        void clear()\r
        {\r
                tbb::spin_rw_mutex::scoped_lock lock(mutex_, true);\r
@@ -229,6 +271,9 @@ public:
                for(auto it = std::begin(observers); it != std::end(observers); ++it)\r
                        (*it)->on_next(e);\r
        }\r
+\r
+       // Properties\r
+\r
 private:\r
        typedef tbb::cache_aligned_allocator<std::weak_ptr<observer>>   allocator;\r
 \r
@@ -247,9 +292,14 @@ class basic_subject sealed : public subject<I, O>
 \r
        typedef basic_subject_impl<I, O> impl;\r
 public:        \r
+\r
+       // Static Members\r
+\r
        typedef typename subject<I, O>::observer                observer;\r
        typedef typename subject<I, O>::observer_ptr    observer_ptr;\r
 \r
+       // Constructors\r
+\r
        basic_subject()\r
                : impl_(std::make_shared<impl>())\r
 \r
@@ -266,6 +316,8 @@ public:
                other.swap(*this);\r
        }\r
 \r
+       // Methods\r
+\r
        void swap(basic_subject& other)\r
        {\r
                impl_.swap(other.impl_);\r
@@ -290,6 +342,9 @@ public:
        {\r
                return impl_;\r
        }\r
+\r
+       // Properties\r
+\r
 private:\r
        std::shared_ptr<impl> impl_;\r
 };\r

diff --git a/common/utf.h b/common/utf.h
index f60182ab81998dcad13427e5e3b6ba2bbd6058b6..776d495a784de0d79894c34f95cabaf60275309d 100644 (file)
--- a/common/utf.h
+++ b/common/utf.h
@@ -22,7 +22,6 @@
 #pragma once\r
 \r
 #include <string>\r
-#include <boost/lexical_cast.hpp>\r
           \r
 namespace caspar {\r
 \r

diff --git a/core/StdAfx.h b/core/StdAfx.h
index 92f9c398fb8cf74a0f8437c039e75c1c7e15329a..ff33505b0b99c5d3d2d50199b6259984d254bcbd 100644 (file)
--- a/core/StdAfx.h
+++ b/core/StdAfx.h
@@ -58,8 +58,8 @@
 \r
 #include <common/assert.h>\r
 #include <common/utf.h>\r
-#include <common/spl/memory.h>\r
-//#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
+#include <common/memory.h>\r
+//#include "../common/executor.h" // Can't include this due to MSVC lambda bug\r
 \r
 #include <common/log.h>\r
 #include <common/except.h>\r

diff --git a/core/consumer/frame_consumer.cpp b/core/consumer/frame_consumer.cpp
index 90989debce4d799ba91c63d9a49eb493d0705931..6178c393da48255553c3a03b808725dfefb1ade5 100644 (file)
--- a/core/consumer/frame_consumer.cpp
+++ b/core/consumer/frame_consumer.cpp
@@ -28,7 +28,7 @@
 #include <core/video_format.h>\r
 #include <core/frame/frame.h>\r
 \r
-#include <common/concurrency/async.h>\r
+#include <common/future.h>\r
 \r
 namespace caspar { namespace core {\r
                \r

diff --git a/core/consumer/frame_consumer.h b/core/consumer/frame_consumer.h
index c9fd5921289c1800cb4bae63bcb523602a71e428..e8176b232129b41594383f6aad1994f7319b4378 100644 (file)
--- a/core/consumer/frame_consumer.h
+++ b/core/consumer/frame_consumer.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <boost/property_tree/ptree_fwd.hpp>\r
 \r

diff --git a/core/consumer/output.cpp b/core/consumer/output.cpp
index 9bc1a59b61f38ca745a61ec35ef07cf45098ff17..53aa9991b21bee873dfe8102c7cc4e804fdd8972 100644 (file)
--- a/core/consumer/output.cpp
+++ b/core/consumer/output.cpp
@@ -32,19 +32,20 @@
 #include "../video_format.h"\r
 #include "../frame/frame.h"\r
 \r
-#include <common/concurrency/async.h>\r
-#include <common/concurrency/executor.h>\r
+#include <common/assert.h>\r
+#include <common/future.h>\r
+#include <common/executor.h>\r
 #include <common/diagnostics/graph.h>\r
 #include <common/prec_timer.h>\r
-#include <common/memory/memshfl.h>\r
+#include <common/memshfl.h>\r
 #include <common/env.h>\r
 \r
-#include <common/assert.h>\r
 #include <boost/circular_buffer.hpp>\r
-#include <boost/timer.hpp>\r
+#include <boost/lexical_cast.hpp>\r
+#include <boost/property_tree/ptree.hpp>\r
 #include <boost/range/algorithm.hpp>\r
 #include <boost/range/adaptors.hpp>\r
-#include <boost/property_tree/ptree.hpp>\r
+#include <boost/timer.hpp>\r
 \r
 namespace caspar { namespace core {\r
        \r

diff --git a/core/consumer/output.h b/core/consumer/output.h
index 24b92d09e7a593a99274f94512396c884e226525..81f4acdc7d600d8c606531b8d9b76a12bbbb2d46 100644 (file)
--- a/core/consumer/output.h
+++ b/core/consumer/output.h
@@ -22,12 +22,12 @@
 #pragma once\r
 \r
 #include <common/forward.h>\r
-#include <common/spl/memory.h>\r
+#include <common/future_fwd.h>\r
+#include <common/memory.h>\r
 #include <common/reactive.h>\r
 \r
 #include <boost/property_tree/ptree_fwd.hpp>\r
 \r
-FORWARD1(boost, template<typename> class unique_future)\r
 FORWARD2(caspar, diagnostics, class graph);\r
 \r
 namespace caspar { namespace core {\r

diff --git a/core/frame/draw_frame.h b/core/frame/draw_frame.h
index e4f62429c3e140a29e9083176061f121cdc8234e..ab3f8fb9cc62b0ad7f84852a3da1b85d5edd50bc 100644 (file)
--- a/core/frame/draw_frame.h
+++ b/core/frame/draw_frame.h
@@ -25,7 +25,7 @@
 \r
 #include <core/video_format.h>\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <vector>\r
 \r

diff --git a/core/frame/frame.cpp b/core/frame/frame.cpp
index 31f7cba963269d7f58ea8ff3bbdd3def0b630e8e..497fc1e137a2ae452677cd32f0f7b12242201887 100644 (file)
--- a/core/frame/frame.cpp
+++ b/core/frame/frame.cpp
@@ -24,7 +24,7 @@
 #include "frame.h"\r
 \r
 #include <common/except.h>\r
-#include <common/memory/array.h>\r
+#include <common/array.h>\r
 \r
 #include <core/frame/frame_visitor.h>\r
 #include <core/frame/pixel_format.h>\r

diff --git a/core/frame/frame.h b/core/frame/frame.h
index 056631d956805269417e29a4654d6e7ec9d3f769..0e09bb89ff07950033da204dcfbf945d955f592b 100644 (file)
--- a/core/frame/frame.h
+++ b/core/frame/frame.h
@@ -2,9 +2,9 @@
 \r
 #include "../video_format.h"\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 #include <common/forward.h>\r
-#include <common/memory/array.h>\r
+#include <common/array.h>\r
 \r
 #include <boost/range.hpp>\r
 #include <boost/any.hpp>\r

diff --git a/core/frame/frame_factory.h b/core/frame/frame_factory.h
index 879cccc245b39a1624ca0ca117806c53574a58c0..791f5addff732148e6e9d30fc55087abee5a8c95 100644 (file)
--- a/core/frame/frame_factory.h
+++ b/core/frame/frame_factory.h
@@ -23,7 +23,7 @@
 \r
 #include "frame.h"\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <core/video_format.h>\r
 \r

diff --git a/core/mixer/audio/audio_mixer.h b/core/mixer/audio/audio_mixer.h
index c90e77147ef07a685f7577a7cc76778733b5dbb8..dd7764b3444b353cd3f2770deabf8a731af09a5f 100644 (file)
--- a/core/mixer/audio/audio_mixer.h
+++ b/core/mixer/audio/audio_mixer.h
@@ -22,7 +22,7 @@
 #pragma once\r
 \r
 #include <common/forward.h>\r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <core/frame/frame_visitor.h>\r
 \r

diff --git a/core/mixer/image/image_mixer.h b/core/mixer/image/image_mixer.h
index 7f914e203197a676b47abaca88758d7f3c38fe00..7e54b236f020431e80cd68e4b48b2b8d4f499e73 100644 (file)
--- a/core/mixer/image/image_mixer.h
+++ b/core/mixer/image/image_mixer.h
@@ -24,7 +24,8 @@
 #include "blend_modes.h"\r
 \r
 #include <common/forward.h>\r
-#include <common/spl/memory.h>\r
+#include <common/future_fwd.h>\r
+#include <common/memory.h>\r
 \r
 #include <core/video_format.h>\r
 #include <core/frame/frame_visitor.h>\r
@@ -35,7 +36,6 @@
 \r
 #include <cstdint>\r
 \r
-FORWARD1(boost, template<typename> class unique_future);\r
 FORWARD2(caspar, core, struct pixel_format_desc);\r
 \r
 namespace caspar { namespace core {\r

diff --git a/core/mixer/mixer.cpp b/core/mixer/mixer.cpp
index 70bade57f905709474557f9b89d8f6875f7d6543..1651143390644f5a5f360a8e9c7b8dc92a6e7b9e 100644 (file)
--- a/core/mixer/mixer.cpp
+++ b/core/mixer/mixer.cpp
@@ -29,7 +29,7 @@
 #include "image/image_mixer.h"\r
 \r
 #include <common/env.h>\r
-#include <common/concurrency/executor.h>\r
+#include <common/executor.h>\r
 #include <common/diagnostics/graph.h>\r
 #include <common/except.h>\r
 #include <common/gl/gl_check.h>\r

diff --git a/core/mixer/mixer.h b/core/mixer/mixer.h
index 0874aca482f20eb32ee72631bd8ff49b23e5b575..9bf2df1e2f6fbf6d73f2369dd3ec87f957fecff6 100644 (file)
--- a/core/mixer/mixer.h
+++ b/core/mixer/mixer.h
@@ -24,7 +24,8 @@
 #include "image/blend_modes.h"\r
 \r
 #include <common/forward.h>\r
-#include <common/spl/memory.h>\r
+#include <common/future_fwd.h>\r
+#include <common/memory.h>\r
 #include <common/reactive.h>\r
 \r
 #include <core/video_format.h>\r
@@ -33,7 +34,6 @@
 \r
 #include <map>\r
 \r
-FORWARD1(boost, template<typename> class unique_future);\r
 FORWARD2(caspar, diagnostics, class graph);\r
 \r
 namespace caspar { namespace core {\r

diff --git a/core/monitor/monitor.h b/core/monitor/monitor.h
index eb3701e8fe174a0c874310ce9228135f5743e57e..f19847d1d42f77c928459df964fbf08089cdd20a 100644 (file)
--- a/core/monitor/monitor.h
+++ b/core/monitor/monitor.h
@@ -1,7 +1,7 @@
 #pragma once\r
 \r
 #include <common/reactive.h>\r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <functional>\r
 #include <string>\r

diff --git a/core/producer/color/color_producer.cpp b/core/producer/color/color_producer.cpp
index 8e1848bd1d9dda12537d3f6080203667036bcdba..9b28f58ba7a0b0c97741ad21405e779bc712b8e8 100644 (file)
--- a/core/producer/color/color_producer.cpp
+++ b/core/producer/color/color_producer.cpp
@@ -31,7 +31,7 @@
 #include <core/monitor/monitor.h>\r
 \r
 #include <common/except.h>\r
-#include <common/memory/array.h>\r
+#include <common/array.h>\r
 \r
 #include <boost/algorithm/string.hpp>\r
 \r

diff --git a/core/producer/color/color_producer.h b/core/producer/color/color_producer.h
index e2b6fcbb13377d92ea8eb222df16bd64bb8a1947..6cb7a8d66a7ed43f99130f5d0a2e6357c7c34e0d 100644 (file)
--- a/core/producer/color/color_producer.h
+++ b/core/producer/color/color_producer.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <string>\r
 #include <vector>\r

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index ca14bea7accf892d8acd4bfcb60c976da821d58a..cbb97fa6e60f9fa348ada1acd4e0c06c9e5edd74 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -31,9 +31,9 @@
 \r
 #include <common/assert.h>\r
 #include <common/except.h>\r
-#include <common/concurrency/executor.h>\r
-#include <common/concurrency/async.h>\r
-#include <common/spl/memory.h>\r
+#include <common/executor.h>\r
+#include <common/future.h>\r
+#include <common/memory.h>\r
 \r
 namespace caspar { namespace core {\r
        \r

diff --git a/core/producer/frame_producer.h b/core/producer/frame_producer.h
index e1581252563054279805b4f058807a200a3ac8af..e720022eada5459b189620a7a4bf96c15f13189b 100644 (file)
--- a/core/producer/frame_producer.h
+++ b/core/producer/frame_producer.h
@@ -25,7 +25,8 @@
 #include "../video_format.h"\r
 \r
 #include <common/forward.h>\r
-#include <common/spl/memory.h>\r
+#include <common/future_fwd.h>\r
+#include <common/memory.h>\r
 #include <common/enum_class.h>\r
 \r
 #include <cstdint>\r
@@ -38,7 +39,6 @@
 #include <boost/property_tree/ptree_fwd.hpp>\r
 \r
 FORWARD1(caspar, class executor);\r
-FORWARD1(boost, template<typename T> class unique_future);\r
 \r
 namespace caspar { namespace core {\r
        \r

diff --git a/core/producer/layer.h b/core/producer/layer.h
index 82fe1aeec563413c3887766eee1171cd22d16139..58768ba0f0bdc7b3d04bfdb96be0e357a09a096c 100644 (file)
--- a/core/producer/layer.h
+++ b/core/producer/layer.h
@@ -26,13 +26,13 @@
 #include "../monitor/monitor.h"\r
 \r
 #include <common/forward.h>\r
-#include <common/spl/memory.h>\r
+#include <common/future_fwd.h>\r
+#include <common/memory.h>\r
 \r
 #include <boost/property_tree/ptree_fwd.hpp>\r
 \r
 #include <string>\r
 \r
-FORWARD1(boost, template<typename T> class unique_future);\r
 FORWARD1(boost, template<typename T> class optional);\r
 \r
 namespace caspar { namespace core {\r

diff --git a/core/producer/separated/separated_producer.h b/core/producer/separated/separated_producer.h
index 48afe6cea405db364b8316e725fe9464fef27151..fb6658aa83fe32cfb63aded3282491c6ef127db2 100644 (file)
--- a/core/producer/separated/separated_producer.h
+++ b/core/producer/separated/separated_producer.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <string>\r
 \r

diff --git a/core/producer/stage.cpp b/core/producer/stage.cpp
index 62ddf5e3c800cd3c382e12a5a23de85ef521bfa7..7b410513676179d566e1ae3ef18776333e168de8 100644 (file)
--- a/core/producer/stage.cpp
+++ b/core/producer/stage.cpp
@@ -28,7 +28,7 @@
 #include "../frame/draw_frame.h"\r
 #include "../frame/frame_factory.h"\r
 \r
-#include <common/concurrency/executor.h>\r
+#include <common/executor.h>\r
 #include <common/diagnostics/graph.h>\r
 \r
 #include <core/frame/frame_transform.h>\r

diff --git a/core/producer/stage.h b/core/producer/stage.h
index 900d841c990b208691ffc73742c7893c2147c5f8..51486f897a9a5aa23ea4d8d2f2a9257785163807 100644 (file)
--- a/core/producer/stage.h
+++ b/core/producer/stage.h
@@ -26,7 +26,8 @@
 #include "../monitor/monitor.h"\r
 \r
 #include <common/forward.h>\r
-#include <common/spl/memory.h>\r
+#include <common/future_fwd.h>\r
+#include <common/memory.h>\r
 #include <common/tweener.h>\r
 \r
 #include <boost/optional.hpp>\r
@@ -37,7 +38,6 @@
 #include <vector>\r
 \r
 FORWARD2(caspar, diagnostics, class graph);\r
-FORWARD1(boost, template<typename> class unique_future);\r
 \r
 namespace caspar { namespace core {\r
        \r

diff --git a/core/producer/transition/transition_producer.h b/core/producer/transition/transition_producer.h
index 67ce0ad7fde6a1377da588342cf84eef25f5f1fe..c4e47affcae039e0b938be57a8c58348403fccf8 100644 (file)
--- a/core/producer/transition/transition_producer.h
+++ b/core/producer/transition/transition_producer.h
@@ -24,7 +24,7 @@
 #include "../../video_format.h"\r
 \r
 #include <common/enum_class.h>\r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 #include <common/tweener.h>\r
 \r
 #include <string>\r

diff --git a/core/video_channel.cpp b/core/video_channel.cpp
index a8febb9f32b21cdd32993ae3047c920131092c80..b20eb4abb03d366e11402d55afcb49e41d31d106 100644 (file)
--- a/core/video_channel.cpp
+++ b/core/video_channel.cpp
@@ -34,8 +34,8 @@
 \r
 #include <common/diagnostics/graph.h>\r
 #include <common/env.h>\r
-#include <common/concurrency/lock.h>\r
-#include <common/concurrency/executor.h>\r
+#include <common/lock.h>\r
+#include <common/executor.h>\r
 \r
 #include <core/mixer/image/image_mixer.h>\r
 \r

diff --git a/core/video_channel.h b/core/video_channel.h
index 13836b51256198ece12882c560d57761e412c26f..b0bf8da4f51cedd7b77121465fc8aa95ccc83919 100644 (file)
--- a/core/video_channel.h
+++ b/core/video_channel.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 #include <common/reactive.h>\r
 #include <common/forward.h>\r
 \r

diff --git a/modules/bluefish/StdAfx.h b/modules/bluefish/StdAfx.h
index cc64767d620ba9b3de02dbb2bd4206fca5c2828a..a75d470b4c0ea72bd61eee02477c1782c459d31c 100644 (file)
--- a/modules/bluefish/StdAfx.h
+++ b/modules/bluefish/StdAfx.h
@@ -40,8 +40,8 @@
 #include <math.h>\r
 \r
 #include <common/utf.h>\r
-#include <common/spl/memory.h>\r
-//#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
+#include <common/memory.h>\r
+//#include "../common/executor.h" // Can't include this due to MSVC lambda bug\r
 \r
 #include <common/log.h>\r
 #include <common/except.h>\r

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index 9c1b129137a4499dc99e3d029438cec29b92cd5f..056c44a03483ae0ebc032a963dc43bcf620069c9 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -28,10 +28,10 @@
 #include <core/video_format.h>\r
 #include <core/frame/frame.h>\r
 \r
-#include <common/concurrency/executor.h>\r
+#include <common/executor.h>\r
 #include <common/diagnostics/graph.h>\r
-#include <common/memory/array.h>\r
-#include <common/memory/memshfl.h>\r
+#include <common/array.h>\r
+#include <common/memshfl.h>\r
 \r
 #include <core/consumer/frame_consumer.h>\r
 #include <core/mixer/audio/audio_util.h>\r

diff --git a/modules/bluefish/consumer/bluefish_consumer.h b/modules/bluefish/consumer/bluefish_consumer.h
index c5cb86761b62fafa3b42be6e7d418e4667d6e717..66b3787b6929cb81c489c2bb30cc22e40f43d1bd 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.h
+++ b/modules/bluefish/consumer/bluefish_consumer.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <boost/property_tree/ptree.hpp>\r
 \r

diff --git a/modules/bluefish/util/blue_velvet.h b/modules/bluefish/util/blue_velvet.h
index 64573b2b86130bab17346c5ab9ea254f602099ef..08273f62eddbcfcba86feb8134471e7a1d72a048 100644 (file)
--- a/modules/bluefish/util/blue_velvet.h
+++ b/modules/bluefish/util/blue_velvet.h
@@ -26,7 +26,7 @@
 #include <BlueVelvet4.h>\r
 #include <BlueHancUtils.h>\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 #include <common/except.h>\r
 \r
 namespace caspar { \r

diff --git a/modules/bluefish/util/memory.h b/modules/bluefish/util/memory.h
index d9ffebac2d2b88b4c56d43a900620339374f8637..9299fdb1f8f5690847f555e8b4224b8e940c53eb 100644 (file)
--- a/modules/bluefish/util/memory.h
+++ b/modules/bluefish/util/memory.h
@@ -25,7 +25,7 @@
 \r
 #include <BlueVelvet4.h>\r
 \r
-#include <common/memory/page_locked_allocator.h>\r
+#include <common/page_locked_allocator.h>\r
 \r
 #include <vector>\r
 \r

diff --git a/modules/decklink/StdAfx.h b/modules/decklink/StdAfx.h
index 2d5d5697cb8e266e21a9d36290ba56a14a6b5b78..fabfdbff07b7cdadd8e3ab64045f19ecb09417a3 100644 (file)
--- a/modules/decklink/StdAfx.h
+++ b/modules/decklink/StdAfx.h
@@ -80,7 +80,7 @@ extern "C"
 #include <functional>\r
 \r
 \r
-#include "../common/spl/memory.h"\r
+#include "../common/memory.h"\r
 #include "../common/utf.h"\r
 #include "../common/except.h"\r
 #include "../common/log.h"\r

diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp
index 30416b9faee3ace53bd80784a65c2a64fbf2f58b..74f5d8d0d7ee8b72b5391165e035039ae2fbe252 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.cpp
+++ b/modules/decklink/consumer/decklink_consumer.cpp
@@ -30,12 +30,12 @@
 #include <core/frame/frame.h>\r
 #include <core/mixer/audio/audio_mixer.h>\r
 \r
-#include <common/concurrency/executor.h>\r
-#include <common/concurrency/lock.h>\r
+#include <common/executor.h>\r
+#include <common/lock.h>\r
 #include <common/diagnostics/graph.h>\r
 #include <common/except.h>\r
-#include <common/memory/memshfl.h>\r
-#include <common/memory/array.h>\r
+#include <common/memshfl.h>\r
+#include <common/array.h>\r
 \r
 #include <core/consumer/frame_consumer.h>\r
 \r

diff --git a/modules/decklink/consumer/decklink_consumer.h b/modules/decklink/consumer/decklink_consumer.h
index e0e6fd07421357ba1841df07985781eba1a7c87f..863d62c8a64db5ddaa543ed03b1b63103e4cd446 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.h
+++ b/modules/decklink/consumer/decklink_consumer.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <core/video_format.h>\r
 \r

diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp
index c2c0d224ca9378c2af5919379fb0f5de9d4325c3..3833f91f015ec20d06d0ea6894506c449230569e 100644 (file)
--- a/modules/decklink/producer/decklink_producer.cpp
+++ b/modules/decklink/producer/decklink_producer.cpp
@@ -31,7 +31,7 @@
 #include "../../ffmpeg/producer/muxer/frame_muxer.h"\r
 #include "../../ffmpeg/producer/muxer/display_mode.h"\r
 \r
-#include <common/concurrency/executor.h>\r
+#include <common/executor.h>\r
 #include <common/diagnostics/graph.h>\r
 #include <common/except.h>\r
 #include <common/log.h>\r

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index 733659fb8e5a9f8983613122cbd2ce53c1abc702..d0448084e8888d89b8cc4909803977e347384c6f 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -33,10 +33,10 @@
 #include <common/env.h>\r
 #include <common/utf.h>\r
 #include <common/param.h>\r
-#include <common/concurrency/executor.h>\r
+#include <common/executor.h>\r
 #include <common/diagnostics/graph.h>\r
-#include <common/memory/array.h>\r
-#include <common/spl/memory.h>\r
+#include <common/array.h>\r
+#include <common/memory.h>\r
 \r
 #include <boost/algorithm/string.hpp>\r
 #include <boost/timer.hpp>\r

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.h b/modules/ffmpeg/consumer/ffmpeg_consumer.h
index 1a6873ac12f89c8f29b840ccfec9f7c782e126ff..476e675762f36a5a7fd09756fc178f173551eb16 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.h
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <boost/property_tree/ptree_fwd.hpp>\r
 \r

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.h b/modules/ffmpeg/producer/audio/audio_decoder.h
index 50223606c5dfb168fa3a734d4c821989f57ed7f5..7763c5329bcd828f1cedae66b2896c15f09d798a 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.h
+++ b/modules/ffmpeg/producer/audio/audio_decoder.h
@@ -24,7 +24,7 @@
 #include <core/mixer/audio/audio_mixer.h>\r
 #include <core/monitor/monitor.h>\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.h b/modules/ffmpeg/producer/ffmpeg_producer.h
index 626baa5279ea9c8fd98b2e080b1d9b1d58590e11..72853ad82cb8b98e6e3f86919ff54ad5af886f62 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.h
+++ b/modules/ffmpeg/producer/ffmpeg_producer.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <core/producer/frame_producer.h>\r
 #include <core/video_format.h>\r

diff --git a/modules/ffmpeg/producer/filter/filter.h b/modules/ffmpeg/producer/filter/filter.h
index 4ff14ce23601ab6dceaecd6188b880c55563a63b..bd08839c5cd2862725f045091cd596c5860fb8da 100644 (file)
--- a/modules/ffmpeg/producer/filter/filter.h
+++ b/modules/ffmpeg/producer/filter/filter.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 #include <boost/algorithm/string/case_conv.hpp>\r

diff --git a/modules/ffmpeg/producer/input/input.cpp b/modules/ffmpeg/producer/input/input.cpp
index 9289c935405ba9239a550d93c44a7b37f7a5b5df..0d5f94faa9f1822762acbdbc308c1887f4e4c8a6 100644 (file)
--- a/modules/ffmpeg/producer/input/input.cpp
+++ b/modules/ffmpeg/producer/input/input.cpp
@@ -27,7 +27,7 @@
 #include "../../ffmpeg_error.h"\r
 \r
 #include <common/diagnostics/graph.h>\r
-#include <common/concurrency/executor.h>\r
+#include <common/executor.h>\r
 #include <common/except.h>\r
 #include <common/log.h>\r
 \r

diff --git a/modules/ffmpeg/producer/input/input.h b/modules/ffmpeg/producer/input/input.h
index 1e3d11f4af4d551f10f9c06d5028cfb2aacb12a8..474ae502b04198782e4922964413a99c40d9cd1e 100644 (file)
--- a/modules/ffmpeg/producer/input/input.h
+++ b/modules/ffmpeg/producer/input/input.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <memory>\r
 #include <string>\r

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.h b/modules/ffmpeg/producer/muxer/frame_muxer.h
index 1a5e5578b6358fa9c368a1448018de03f7b9a5a5..f6a23750b7b8014266419d093925b56eb1a0e1ee 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.h
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.h
@@ -24,7 +24,7 @@
 #include "display_mode.h"\r
 \r
 #include <common/forward.h>\r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <core/mixer/audio/audio_mixer.h>\r
 #include <core/video_format.h>\r

diff --git a/modules/ffmpeg/producer/util/util.cpp b/modules/ffmpeg/producer/util/util.cpp
index 7677bd807e83af4c7978db066cd95f1c866e1ad5..ae03350ec9ed01b4f97d78f37cc7531b8ee52312 100644 (file)
--- a/modules/ffmpeg/producer/util/util.cpp
+++ b/modules/ffmpeg/producer/util/util.cpp
@@ -37,7 +37,7 @@
 #include <core/producer/frame_producer.h>\r
 \r
 #include <common/except.h>\r
-#include <common/memory/array.h>\r
+#include <common/array.h>\r
 \r
 #include <tbb/parallel_for.h>\r
 \r

diff --git a/modules/ffmpeg/producer/util/util.h b/modules/ffmpeg/producer/util/util.h
index 87310f9d430d7533297ada7547de5e70c73c1ba7..b46b2610adeea42fc326cc67391dc31c22a3424b 100644 (file)
--- a/modules/ffmpeg/producer/util/util.h
+++ b/modules/ffmpeg/producer/util/util.h
@@ -22,7 +22,7 @@
 #pragma once\r
 \r
 #include <common/forward.h>\r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <core/video_format.h>\r
 #include <core/frame/pixel_format.h>\r

diff --git a/modules/ffmpeg/producer/video/video_decoder.h b/modules/ffmpeg/producer/video/video_decoder.h
index 740c72450d1c02bb64277477878dc778b96636d7..42cca6284c168414bea88a91ba510d6551459e3e 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.h
+++ b/modules/ffmpeg/producer/video/video_decoder.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 #include <common/forward.h>\r
 \r
 #include <core/monitor/monitor.h>\r

diff --git a/modules/flash/StdAfx.h b/modules/flash/StdAfx.h
index 5526d729d28bdaf82b83d3c27d6dd8a25ced6c76..35988d2ad339648804367543e7da49a3ccf4289d 100644 (file)
--- a/modules/flash/StdAfx.h
+++ b/modules/flash/StdAfx.h
@@ -54,8 +54,8 @@
 #include <boost/property_tree/ptree.hpp>\r
 \r
 #include "../common/utf.h"\r
-#include "../common/spl/memory.h"\r
-//#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
+#include "../common/memory.h"\r
+//#include "../common/executor.h" // Can't include this due to MSVC lambda bug\r
 \r
 #include "../common/log.h"\r
 #include "../common/except.h"\r

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index 9883b3e263eb13eb7d2288b78e51919624e81a48..108881df71594efa21a5b427eb78ce9399e4ddc5 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -38,11 +38,11 @@
 #include <core/monitor/monitor.h>\r
 \r
 #include <common/env.h>\r
-#include <common/concurrency/executor.h>\r
-#include <common/concurrency/lock.h>\r
+#include <common/executor.h>\r
+#include <common/lock.h>\r
 #include <common/diagnostics/graph.h>\r
 #include <common/prec_timer.h>\r
-#include <common/memory/array.h>\r
+#include <common/array.h>\r
 \r
 #include <boost/filesystem.hpp>\r
 #include <boost/property_tree/ptree.hpp>\r

diff --git a/modules/flash/producer/flash_producer.h b/modules/flash/producer/flash_producer.h
index ff0d72907a12890bae40694260003c156bb6f0c3..6abe203baf14acc1e3fb3beea584a09b91f902f2 100644 (file)
--- a/modules/flash/producer/flash_producer.h
+++ b/modules/flash/producer/flash_producer.h
@@ -23,7 +23,7 @@
 \r
 #include <core/producer/frame_producer.h>\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <vector>\r
 #include <string>\r

diff --git a/modules/image/consumer/image_consumer.cpp b/modules/image/consumer/image_consumer.cpp
index f15ab2a845c77b2bb4cf68b680b906d0f7caee37..e15c43b9bdebd2d8d621855d738fea8348293c71 100644 (file)
--- a/modules/image/consumer/image_consumer.cpp
+++ b/modules/image/consumer/image_consumer.cpp
@@ -25,7 +25,7 @@
 #include <common/env.h>\r
 #include <common/log.h>\r
 #include <common/utf.h>\r
-#include <common/memory/array.h>\r
+#include <common/array.h>\r
 \r
 #include <core/consumer/frame_consumer.h>\r
 #include <core/video_format.h>\r

diff --git a/modules/image/consumer/image_consumer.h b/modules/image/consumer/image_consumer.h
index 6f11392c03d407a20423bc59174d9f67149cdf85..0df10c9fc5e8cd4b7397c9c428d78f8984db20a0 100644 (file)
--- a/modules/image/consumer/image_consumer.h
+++ b/modules/image/consumer/image_consumer.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <core/video_format.h>\r
 \r

diff --git a/modules/image/producer/image_producer.cpp b/modules/image/producer/image_producer.cpp
index 8d0734725a079cfc6440bca1ff7c7677c3f2c164..f7ec87f8a7e5247016aa3416afcfbb57fb0fb4bb 100644 (file)
--- a/modules/image/producer/image_producer.cpp
+++ b/modules/image/producer/image_producer.cpp
@@ -34,7 +34,7 @@
 \r
 #include <common/env.h>\r
 #include <common/log.h>\r
-#include <common/memory/array.h>\r
+#include <common/array.h>\r
 \r
 #include <boost/assign.hpp>\r
 #include <boost/filesystem.hpp>\r

diff --git a/modules/image/producer/image_scroll_producer.cpp b/modules/image/producer/image_scroll_producer.cpp
index 41e68f71f982155d158ed95f1dc3923b5198c699..947ba071fea4f69ff33cab3bd17c03cabd943200 100644 (file)
--- a/modules/image/producer/image_scroll_producer.cpp
+++ b/modules/image/producer/image_scroll_producer.cpp
@@ -35,7 +35,7 @@
 #include <common/env.h>\r
 #include <common/log.h>\r
 #include <common/except.h>\r
-#include <common/memory/array.h>\r
+#include <common/array.h>\r
 \r
 #include <boost/assign.hpp>\r
 #include <boost/filesystem.hpp>\r

diff --git a/modules/oal/consumer/oal_consumer.cpp b/modules/oal/consumer/oal_consumer.cpp
index 9c39c68f98641fb64914831c6917e0e721f70f17..445e38f1be16b05160b0d45d28de152476237fbd 100644 (file)
--- a/modules/oal/consumer/oal_consumer.cpp
+++ b/modules/oal/consumer/oal_consumer.cpp
@@ -28,15 +28,15 @@
 #include <common/env.h>\r
 \r
 #include <core/consumer/frame_consumer.h>\r
+#include <core/frame/frame.h>\r
 #include <core/mixer/audio/audio_util.h>\r
 #include <core/mixer/audio/audio_mixer.h>\r
 #include <core/video_format.h>\r
 \r
-#include <core/frame/frame.h>\r
-\r
 #include <SFML/Audio/SoundStream.hpp>\r
 \r
 #include <boost/circular_buffer.hpp>\r
+#include <boost/lexical_cast.hpp>\r
 #include <boost/property_tree/ptree.hpp>\r
 #include <boost/timer.hpp>\r
 \r

diff --git a/modules/oal/consumer/oal_consumer.h b/modules/oal/consumer/oal_consumer.h
index 87e755835a87ae4b89c844ec812914ea0c80a312..cdd32b0dd4623b9524292afb356ce9d92ee98af6 100644 (file)
--- a/modules/oal/consumer/oal_consumer.h
+++ b/modules/oal/consumer/oal_consumer.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <core/video_format.h>\r
 \r

diff --git a/modules/reroute/producer/reroute_producer.h b/modules/reroute/producer/reroute_producer.h
index d80f7610adc97d50b0ce65f29bf251b2a7183125..4971b844caa38546138a092662558a71f288d9e6 100644 (file)
--- a/modules/reroute/producer/reroute_producer.h
+++ b/modules/reroute/producer/reroute_producer.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 #include <common/forward.h>\r
 \r
 #include <core/frame/frame_factory.h>\r

diff --git a/modules/screen/consumer/screen_consumer.cpp b/modules/screen/consumer/screen_consumer.cpp
index ce33e782697427bbd16a5df21987cdd0de5bccb6..ff7750706a45973549e185e86ea006f9c3299661 100644 (file)
--- a/modules/screen/consumer/screen_consumer.cpp
+++ b/modules/screen/consumer/screen_consumer.cpp
@@ -27,9 +27,9 @@
 #include <common/diagnostics/graph.h>\r
 #include <common/gl/gl_check.h>\r
 #include <common/log.h>\r
-#include <common/spl/memory.h>\r
-#include <common/memory/array.h>\r
-#include <common/memory/memshfl.h>\r
+#include <common/memory.h>\r
+#include <common/array.h>\r
+#include <common/memshfl.h>\r
 #include <common/utf.h>\r
 \r
 #include <ffmpeg/producer/filter/filter.h>\r
@@ -40,9 +40,10 @@
 \r
 #include <boost/timer.hpp>\r
 #include <boost/circular_buffer.hpp>\r
+#include <boost/lexical_cast.hpp>\r
 #include <boost/foreach.hpp>\r
-#include <boost/thread.hpp>\r
 #include <boost/property_tree/ptree.hpp>\r
+#include <boost/thread.hpp>\r
 \r
 #include <tbb/atomic.h>\r
 #include <tbb/concurrent_queue.h>\r
@@ -113,23 +114,23 @@ struct configuration
 \r
 struct screen_consumer : boost::noncopyable\r
 {              \r
-       const configuration             config_;\r
-       core::video_format_desc format_desc_;\r
-       int                                             channel_index_;\r
+       const configuration                                     config_;\r
+       core::video_format_desc                         format_desc_;\r
+       int                                                                     channel_index_;\r
 \r
-       GLuint                                  texture_;\r
-       std::vector<GLuint>             pbos_;\r
+       GLuint                                                          texture_;\r
+       std::vector<GLuint>                                     pbos_;\r
                        \r
-       float                                   width_;\r
-       float                                   height_;        \r
-       int                             screen_x_;\r
-       int                             screen_y_;\r
-       int                             screen_width_;\r
-       int                             screen_height_;\r
-       int                             square_width_;\r
-       int                             square_height_;                         \r
+       float                                                           width_;\r
+       float                                                           height_;        \r
+       int                                                                     screen_x_;\r
+       int                                                                     screen_y_;\r
+       int                                                                     screen_width_;\r
+       int                                                                     screen_height_;\r
+       int                                                                     square_width_;\r
+       int                                                                     square_height_;                         \r
        \r
-       sf::Window                              window_;\r
+       sf::Window                                                      window_;\r
        \r
        spl::shared_ptr<diagnostics::graph>     graph_;\r
        boost::timer                                            perf_timer_;\r
@@ -137,10 +138,10 @@ struct screen_consumer : boost::noncopyable
 \r
        tbb::concurrent_bounded_queue<core::const_frame>        frame_buffer_;\r
 \r
-       boost::thread                   thread_;\r
-       tbb::atomic<bool>               is_running_;\r
+       boost::thread                                           thread_;\r
+       tbb::atomic<bool>                                       is_running_;\r
        \r
-       ffmpeg::filter                  filter_;\r
+       ffmpeg::filter                                          filter_;\r
 public:\r
        screen_consumer(const configuration& config, const core::video_format_desc& format_desc, int channel_index) \r
                : config_(config)\r

diff --git a/modules/screen/consumer/screen_consumer.h b/modules/screen/consumer/screen_consumer.h
index 5a2c4d7e0996766964af384c553108f755e6e7b0..075196774d1d5c0746ed85a149ee9de709cd2fad 100644 (file)
--- a/modules/screen/consumer/screen_consumer.h
+++ b/modules/screen/consumer/screen_consumer.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <vector>\r
 #include <boost/property_tree/ptree.hpp>\r

diff --git a/protocol/StdAfx.h b/protocol/StdAfx.h
index 0f49e6ef068ed86baef3b45c0dfa9e14e4395bf3..b49c4ea79f5f58621269b6309a1fb9dc8ffab68f 100644 (file)
--- a/protocol/StdAfx.h
+++ b/protocol/StdAfx.h
@@ -56,8 +56,8 @@
 #include <boost/range/algorithm.hpp>\r
 \r
 #include "../common/utf.h"\r
-#include "../common/spl/memory.h"\r
-//#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
+#include "../common/memory.h"\r
+//#include "../common/executor.h" // Can't include this due to MSVC lambda bug\r
 \r
 #include "../common/log.h"\r
 #include "../common/except.h"\r

diff --git a/protocol/amcp/AMCPCommandQueue.h b/protocol/amcp/AMCPCommandQueue.h
index 58756c83201dac1a3c8bcd6d21faad260597767a..404d1fa940d04ce31452dd3767861d4f5aeab8ed 100644 (file)
--- a/protocol/amcp/AMCPCommandQueue.h
+++ b/protocol/amcp/AMCPCommandQueue.h
@@ -25,7 +25,7 @@
 \r
 #include "AMCPCommand.h"\r
 \r
-#include <common/concurrency/executor.h>\r
+#include <common/executor.h>\r
 \r
 #include <tbb\mutex.h>\r
 \r

diff --git a/protocol/cii/CIIProtocolStrategy.h b/protocol/cii/CIIProtocolStrategy.h
index b5e36c356c3ff7cafee4a127b55b22fb9120e125..339de712edc5ac6416af216e6c5c83f603551ad4 100644 (file)
--- a/protocol/cii/CIIProtocolStrategy.h
+++ b/protocol/cii/CIIProtocolStrategy.h
@@ -29,7 +29,7 @@
 \r
 #include <core/producer/stage.h>\r
 \r
-#include <common/concurrency/executor.h>\r
+#include <common/executor.h>\r
 \r
 namespace caspar { namespace protocol { namespace cii {\r
 \r

diff --git a/protocol/osc/server.h b/protocol/osc/server.h
index 192a3c96ee39be3d4adf242ade6ac349118bf7e0..508a91288463be39882c470ca3d5ba3cccc4bf02 100644 (file)
--- a/protocol/osc/server.h
+++ b/protocol/osc/server.h
@@ -1,6 +1,6 @@
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <core/monitor/monitor.h>\r
 \r

diff --git a/protocol/util/AsyncEventServer.h b/protocol/util/AsyncEventServer.h
index eee4dfa0766b522317e22687e9fe338060aa7eab..5caee090c092a5b50e0d0abaab6deb229fdd7aa0 100644 (file)
--- a/protocol/util/AsyncEventServer.h
+++ b/protocol/util/AsyncEventServer.h
@@ -30,7 +30,7 @@
 #pragma once\r
 #endif\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <string>\r
 #include <map>\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index e63c4212d904856030e53a4594f9efd8bbe52888..2fb4017e0ea02242989047d8d4918dc1f3ed2fc0 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -13,7 +13,23 @@
   </flash>\r
   <channels>\r
     <channel>\r
-      <video-mode>PAL</video-mode>\r
+      <video-mode>1080p5000</video-mode>\r
+      <consumers>\r
+        <screen>\r
+          <auto-deinterlace>false</auto-deinterlace>\r
+        </screen>\r
+      </consumers>\r
+    </channel>\r
+    <channel>\r
+      <video-mode>1080p5000</video-mode>\r
+      <consumers>\r
+        <screen>\r
+          <auto-deinterlace>false</auto-deinterlace>\r
+        </screen>\r
+      </consumers>\r
+    </channel>\r
+    <channel>\r
+      <video-mode>1080p5000</video-mode>\r
       <consumers>\r
         <screen>\r
           <auto-deinterlace>false</auto-deinterlace>\r

diff --git a/shell/server.h b/shell/server.h
index 9e93dbc6c7f9585cf056d663092fe5d1bf7970f2..08b7ad27cc7c901e68839f3717818408ae88723d 100644 (file)
--- a/shell/server.h
+++ b/shell/server.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include <common/spl/memory.h>\r
+#include <common/memory.h>\r
 \r
 #include <core/monitor/monitor.h>\r
 \r