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

diff --git a/core/consumer/cadence/cadence_guard_consumer.cpp b/core/consumer/cadence_guard.cpp
similarity index 92%
rename from core/consumer/cadence/cadence_guard_consumer.cpp
rename to core/consumer/cadence_guard.cpp
index 2dd9617c5ab15d827bb0c1f80d839da910b12ba9..7319fa5bfbd7d12937cd0ff8e25d21e1c30bc20b 100644 (file)
--- a/core/consumer/cadence/cadence_guard_consumer.cpp
+++ b/core/consumer/cadence_guard.cpp
@@ -1,6 +1,8 @@
-#include "../../stdafx.h"\r
+#include "../stdafx.h"\r
 \r
-#include "../frame_consumer.h"\r
+#include "cadence_guard.h"\r
+\r
+#include "frame_consumer.h"\r
 \r
 #include <common/env.h>\r
 #include <common/memory/safe_ptr.h>\r

diff --git a/core/consumer/cadence/cadence_guard_consumer.h b/core/consumer/cadence_guard.h
similarity index 100%
rename from core/consumer/cadence/cadence_guard_consumer.h
rename to core/consumer/cadence_guard.h

diff --git a/core/consumer/frame_consumer.cpp b/core/consumer/frame_consumer.cpp
index 9b74a7143adecb9a63f1e89ef012468222ec00f2..5c8306ccf6f6132e9a04b6779fcfd77f96e5c6f3 100644 (file)
--- a/core/consumer/frame_consumer.cpp
+++ b/core/consumer/frame_consumer.cpp
@@ -23,8 +23,6 @@
 \r
 #include "frame_consumer.h"\r
 \r
-#include "cadence/cadence_guard_consumer.h"\r
-\r
 namespace caspar { namespace core {\r
                \r
 std::vector<const consumer_factory_t> g_factories;\r

diff --git a/core/consumer/output.cpp b/core/consumer/output.cpp
index 69e69896842ac38eda189e42e72e3cd35f3fa40a..26a67fe3f35531d59a17a652c9993dcc6e86d505 100644 (file)
--- a/core/consumer/output.cpp
+++ b/core/consumer/output.cpp
@@ -29,7 +29,7 @@
 \r
 #include "frame_consumer.h"\r
 \r
-#include "cadence/cadence_guard_consumer.h"\r
+#include "cadence_guard.h"\r
 \r
 #include "../video_format.h"\r
 #include "../frame/data_frame.h"\r

diff --git a/core/core.vcxproj b/core/core.vcxproj
index 174170a44dd16b2f9b168700510347e8b3fc312d..6cac3876749467bc4b166a026c3c8327f4d822d8 100644 (file)
--- a/core/core.vcxproj
+++ b/core/core.vcxproj
@@ -117,7 +117,7 @@
     </Lib>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="consumer\cadence\cadence_guard_consumer.h" />\r
+    <ClInclude Include="consumer\cadence_guard.h" />\r
     <ClInclude Include="frame\draw_frame.h" />\r
     <ClInclude Include="frame\data_frame.h" />\r
     <ClInclude Include="frame\frame_factory.h" />\r
@@ -156,9 +156,9 @@
     <ClInclude Include="StdAfx.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="consumer\cadence\cadence_guard_consumer.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../StdAfx.h</PrecompiledHeaderFile>\r
+    <ClCompile Include="consumer\cadence_guard.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="frame\data_frame.cpp">\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../StdAfx.h</PrecompiledHeaderFile>\r

diff --git a/core/core.vcxproj.filters b/core/core.vcxproj.filters
index 7cdf51776e618c8a5b76dd077b2ed569cc9d9dbf..7c424cb2ff11611437ddf8e19c06903d5c2f2246 100644 (file)
--- a/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@ -37,9 +37,6 @@
     <Filter Include="source\frame">\r
       <UniqueIdentifier>{b19721c1-8dd1-45fb-b9e3-212b548ebbb6}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="source\consumer\cadence">\r
-      <UniqueIdentifier>{32043b44-b1bc-4098-8401-4b1467a96a01}</UniqueIdentifier>\r
-    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="producer\transition\transition_producer.h">\r
@@ -133,8 +130,8 @@
     <ClInclude Include="mixer\gpu\write_frame.h">\r
       <Filter>source\mixer\gpu</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="consumer\cadence\cadence_guard_consumer.h">\r
-      <Filter>source\consumer\cadence</Filter>\r
+    <ClInclude Include="consumer\cadence_guard.h">\r
+      <Filter>source\consumer</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
@@ -211,8 +208,8 @@
     <ClCompile Include="mixer\gpu\write_frame.cpp">\r
       <Filter>source\mixer\gpu</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="consumer\cadence\cadence_guard_consumer.cpp">\r
-      <Filter>source\consumer\cadence</Filter>\r
+    <ClCompile Include="consumer\cadence_guard.cpp">\r
+      <Filter>source\consumer</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file