Merged most recent OSC changes

[casparcg] / protocol / protocol.vcxproj.filters

diff --git a/protocol/protocol.vcxproj.filters b/protocol/protocol.vcxproj.filters
index 21f469fa208639f86da5968afaecb6cea03d673f..c94fd46e59bdbaec9f03b9e47612b31d41b9d77d 100644 (file)
--- a/protocol/protocol.vcxproj.filters
+++ b/protocol/protocol.vcxproj.filters
@@ -22,6 +22,9 @@
     <Filter Include="source\osc\oscpack">\r
       <UniqueIdentifier>{d6dede65-7a93-4494-aa2d-d18d5267902c}</UniqueIdentifier>\r
     </Filter>\r
+    <Filter Include="source\asio">\r
+      <UniqueIdentifier>{982ff369-f4a0-418b-b613-81ec322208c5}</UniqueIdentifier>\r
+    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="amcp\AMCPCommand.h">\r
@@ -82,9 +85,6 @@
     <ClInclude Include="osc\oscpack\OscException.h">\r
       <Filter>source\osc\oscpack</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="osc\server.h">\r
-      <Filter>source\osc</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="clk\clk_command_processor.h">\r
       <Filter>source\clk</Filter>\r
     </ClInclude>\r
@@ -97,6 +97,18 @@
     <ClInclude Include="util\strategy_adapters.h">\r
       <Filter>source\util</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="util\lock_container.h">\r
+      <Filter>source\util</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="amcp\amcp_shared.h">\r
+      <Filter>source\amcp</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="osc\client.h">\r
+      <Filter>source\osc</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="asio\io_service_manager.h">\r
+      <Filter>source\asio</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="amcp\AMCPCommandQueue.cpp">\r
@@ -133,9 +145,6 @@
     <ClCompile Include="osc\oscpack\OscTypes.cpp">\r
       <Filter>source\osc\oscpack</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="osc\server.cpp">\r
-      <Filter>source\osc</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="clk\clk_command_processor.cpp">\r
       <Filter>source\clk</Filter>\r
     </ClCompile>\r
@@ -145,5 +154,14 @@
     <ClCompile Include="util\strategy_adapters.cpp">\r
       <Filter>source\util</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="util\lock_container.cpp">\r
+      <Filter>source\util</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="osc\client.cpp">\r
+      <Filter>source\osc</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="asio\io_service_manager.cpp">\r
+      <Filter>source\asio</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file