2.0.0.2: Mixer has now its own project.

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

diff --git a/casparcg.sln b/casparcg.sln
index c2040f14ae3b6591656f3e3a115b8bc753b2b3c3..3384902dbe7459922efeba0ee96c5b9771497268 100644 (file)
--- a/casparcg.sln
+++ b/casparcg.sln
@@ -11,6 +11,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shell", "shell\shell.vcxpro
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "protocol", "protocol\protocol.vcxproj", "{2040B361-1FB6-488E-84A5-38A580DA90DE}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mixer", "mixer\mixer.vcxproj", "{477E12A4-1B28-4FF7-B46D-76606BDD1891}"\r
+EndProject\r
 Global\r
        GlobalSection(SubversionScc) = preSolution\r
                Svn-Managed = True\r
@@ -41,6 +43,10 @@ Global
                {2040B361-1FB6-488E-84A5-38A580DA90DE}.Debug|Win32.Build.0 = Debug|Win32\r
                {2040B361-1FB6-488E-84A5-38A580DA90DE}.Release|Win32.ActiveCfg = Release|Win32\r
                {2040B361-1FB6-488E-84A5-38A580DA90DE}.Release|Win32.Build.0 = Release|Win32\r
+               {477E12A4-1B28-4FF7-B46D-76606BDD1891}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {477E12A4-1B28-4FF7-B46D-76606BDD1891}.Debug|Win32.Build.0 = Debug|Win32\r
+               {477E12A4-1B28-4FF7-B46D-76606BDD1891}.Release|Win32.ActiveCfg = Release|Win32\r
+               {477E12A4-1B28-4FF7-B46D-76606BDD1891}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/core/core.vcxproj b/core/core.vcxproj
index 89b23c749fe940f424be4c56a503f199038d2b97..45bedb35fbca4dad2df0c023072a27c72688435f 100644 (file)
--- a/core/core.vcxproj
+++ b/core/core.vcxproj
@@ -152,21 +152,6 @@
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="..\mixer\audio\audio_mixer.h" />\r
-    <ClInclude Include="..\mixer\audio\audio_transform.h" />\r
-    <ClInclude Include="..\mixer\frame\draw_frame.h" />\r
-    <ClInclude Include="..\mixer\frame\pixel_format.h" />\r
-    <ClInclude Include="..\mixer\frame\read_frame.h" />\r
-    <ClInclude Include="..\mixer\frame\write_frame.h" />\r
-    <ClInclude Include="..\mixer\frame_factory.h" />\r
-    <ClInclude Include="..\mixer\frame_mixer_device.h" />\r
-    <ClInclude Include="..\mixer\fwd.h" />\r
-    <ClInclude Include="..\mixer\gpu\device_buffer.h" />\r
-    <ClInclude Include="..\mixer\gpu\host_buffer.h" />\r
-    <ClInclude Include="..\mixer\gpu\ogl_device.h" />\r
-    <ClInclude Include="..\mixer\image\image_kernel.h" />\r
-    <ClInclude Include="..\mixer\image\image_mixer.h" />\r
-    <ClInclude Include="..\mixer\image\image_transform.h" />\r
     <ClInclude Include="channel.h" />\r
     <ClInclude Include="consumer\bluefish\memory.h" />\r
     <ClInclude Include="consumer\bluefish\bluefish_consumer.h" />\r
@@ -206,54 +191,6 @@
     <ClInclude Include="StdAfx.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="..\mixer\audio\audio_mixer.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\audio\audio_transform.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\frame\draw_frame.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\frame\read_frame.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\frame\write_frame.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\frame_mixer_device.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\gpu\device_buffer.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\gpu\host_buffer.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\gpu\ogl_device.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\image\image_kernel.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\image\image_mixer.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\image\image_transform.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
     <ClCompile Include="channel.cpp" />\r
     <ClCompile Include="consumer\bluefish\bluefish_consumer.cpp">\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
@@ -391,6 +328,9 @@
     <ProjectReference Include="..\common\common.vcxproj">\r
       <Project>{02308602-7fe0-4253-b96e-22134919f56a}</Project>\r
     </ProjectReference>\r
+    <ProjectReference Include="..\mixer\mixer.vcxproj">\r
+      <Project>{477e12a4-1b28-4ff7-b46d-76606bdd1891}</Project>\r
+    </ProjectReference>\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r

diff --git a/core/core.vcxproj.filters b/core/core.vcxproj.filters
index a428e74d543aed078e397d9a7d04d1b9f1887184..bbf80f8ef95d1c0b21f38b23264fe66a2cc1b253 100644 (file)
--- a/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@ -64,21 +64,6 @@
     <Filter Include="Source\consumer\ffmpeg">\r
       <UniqueIdentifier>{b651856c-ff7e-4f90-be8a-32aba6094dbd}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="Source\mixer">\r
-      <UniqueIdentifier>{fe65a63a-9c77-450e-8b5a-d08ea7067053}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Source\mixer\frame">\r
-      <UniqueIdentifier>{3cf873fa-08ad-43e1-b530-fda9d8621ba4}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Source\mixer\image">\r
-      <UniqueIdentifier>{300816f9-421b-4fab-82e0-acabe5b1e1b7}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Source\mixer\audio">\r
-      <UniqueIdentifier>{fd06d1d1-2b0b-4913-8416-f8fa1de42442}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Source\mixer\gpu">\r
-      <UniqueIdentifier>{5e7c7a4c-4a81-4aa1-b628-0344bf89517e}</UniqueIdentifier>\r
-    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="consumer\decklink\DeckLinkAPI_h.h">\r
@@ -177,51 +162,6 @@
     <ClInclude Include="producer\layer.h">\r
       <Filter>Source\producer</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\mixer\frame_factory.h">\r
-      <Filter>Source\mixer</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\mixer\frame_mixer_device.h">\r
-      <Filter>Source\mixer</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\mixer\fwd.h">\r
-      <Filter>Source\mixer</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\mixer\image\image_kernel.h">\r
-      <Filter>Source\mixer\image</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\mixer\image\image_mixer.h">\r
-      <Filter>Source\mixer\image</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\mixer\image\image_transform.h">\r
-      <Filter>Source\mixer\image</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\mixer\gpu\device_buffer.h">\r
-      <Filter>Source\mixer\gpu</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\mixer\gpu\host_buffer.h">\r
-      <Filter>Source\mixer\gpu</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\mixer\gpu\ogl_device.h">\r
-      <Filter>Source\mixer\gpu</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\mixer\frame\draw_frame.h">\r
-      <Filter>Source\mixer\frame</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\mixer\frame\pixel_format.h">\r
-      <Filter>Source\mixer\frame</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\mixer\frame\read_frame.h">\r
-      <Filter>Source\mixer\frame</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\mixer\frame\write_frame.h">\r
-      <Filter>Source\mixer\frame</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\mixer\audio\audio_mixer.h">\r
-      <Filter>Source\mixer\audio</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\mixer\audio\audio_transform.h">\r
-      <Filter>Source\mixer\audio</Filter>\r
-    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="consumer\decklink\DeckLinkAPI_i.c">\r
@@ -302,42 +242,6 @@
     <ClCompile Include="producer\layer.cpp">\r
       <Filter>Source\producer</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\mixer\frame_mixer_device.cpp">\r
-      <Filter>Source\mixer</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\image\image_kernel.cpp">\r
-      <Filter>Source\mixer\image</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\image\image_mixer.cpp">\r
-      <Filter>Source\mixer\image</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\image\image_transform.cpp">\r
-      <Filter>Source\mixer\image</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\gpu\device_buffer.cpp">\r
-      <Filter>Source\mixer\gpu</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\gpu\host_buffer.cpp">\r
-      <Filter>Source\mixer\gpu</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\gpu\ogl_device.cpp">\r
-      <Filter>Source\mixer\gpu</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\frame\draw_frame.cpp">\r
-      <Filter>Source\mixer\frame</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\frame\read_frame.cpp">\r
-      <Filter>Source\mixer\frame</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\frame\write_frame.cpp">\r
-      <Filter>Source\mixer\frame</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\audio\audio_mixer.cpp">\r
-      <Filter>Source\mixer\audio</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mixer\audio\audio_transform.cpp">\r
-      <Filter>Source\mixer\audio</Filter>\r
-    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Midl Include="producer\flash\Flash9e.IDL">\r

diff --git a/mixer/audio/audio_mixer.cpp b/mixer/audio/audio_mixer.cpp
index 071f6447d4effc314645a1a4726e614ef6a9f9ca..7359bd93ee9f3e50b0fd6627098158d60488c73e 100644 (file)
--- a/mixer/audio/audio_mixer.cpp
+++ b/mixer/audio/audio_mixer.cpp
@@ -1,4 +1,4 @@
-#include "../../stdafx.h"\r
+#include "../stdafx.h"\r
 \r
 #include "audio_mixer.h"\r
 #include "audio_transform.h"\r

diff --git a/mixer/audio/audio_transform.cpp b/mixer/audio/audio_transform.cpp
index 59655418d6f455e18c3bfaca698022b2efac57a1..456f6a7bab12066e0f87f8a87dc465608d51a30a 100644 (file)
--- a/mixer/audio/audio_transform.cpp
+++ b/mixer/audio/audio_transform.cpp
@@ -1,4 +1,4 @@
-#include "../../stdafx.h"\r
+#include "../stdafx.h"\r
 \r
 #include "audio_transform.h"\r
 \r

diff --git a/mixer/frame/draw_frame.cpp b/mixer/frame/draw_frame.cpp
index 48e3e278416e4bf202ae44858626df0218d93e2b..efa5f70ab94d1712b200b4ae4c613837176346e1 100644 (file)
--- a/mixer/frame/draw_frame.cpp
+++ b/mixer/frame/draw_frame.cpp
@@ -1,4 +1,4 @@
-#include "../../StdAfx.h"\r
+#include "../stdafx.h"\r
 \r
 #include "draw_frame.h"\r
 \r

diff --git a/mixer/frame/read_frame.cpp b/mixer/frame/read_frame.cpp
index bf1d260cf921d3c4941177208c0e08281bb69d77..a6bc13bc056ff5787e3a26df70cd114abc919316 100644 (file)
--- a/mixer/frame/read_frame.cpp
+++ b/mixer/frame/read_frame.cpp
@@ -1,4 +1,4 @@
-#include "../../StdAfx.h"\r
+#include "../stdafx.h"\r
 \r
 #include "read_frame.h"\r
 \r

diff --git a/mixer/frame/write_frame.cpp b/mixer/frame/write_frame.cpp
index 6ed77b88c24ac4a87b60a13dda0c209bc3b2bfbe..61994bf4ac08e75ee391887f82f0af81f9cf7655 100644 (file)
--- a/mixer/frame/write_frame.cpp
+++ b/mixer/frame/write_frame.cpp
@@ -1,4 +1,4 @@
-#include "../../StdAfx.h"\r
+#include "../stdafx.h"\r
 \r
 #include "write_frame.h"\r
 \r

diff --git a/mixer/frame_mixer_device.cpp b/mixer/frame_mixer_device.cpp
index cb7ac0e757a9e9ceea7df8782e25fcb922565f8b..07eaf20fc935afbfc52bbd2c0979eae68e1c4a39 100644 (file)
--- a/mixer/frame_mixer_device.cpp
+++ b/mixer/frame_mixer_device.cpp
@@ -1,4 +1,4 @@
-#include "../StdAfx.h"\r
+#include "StdAfx.h"\r
 \r
 #include "frame_mixer_device.h"\r
 \r

diff --git a/mixer/gpu/device_buffer.cpp b/mixer/gpu/device_buffer.cpp
index 7755274dd6d4301800c8dc61e29e2275d3f27f6a..ca999e8004dd5135baac7681eb3ea1de3e958132 100644 (file)
--- a/mixer/gpu/device_buffer.cpp
+++ b/mixer/gpu/device_buffer.cpp
@@ -1,4 +1,4 @@
-#include "../../StdAfx.h"\r
+#include "../stdafx.h"\r
 \r
 #include "device_buffer.h"\r
 \r

diff --git a/mixer/gpu/host_buffer.cpp b/mixer/gpu/host_buffer.cpp
index 17b5c7e35e835ed6b9b5d6ea560badd3c62712af..6496b6b8a0ddd396bfbcb1dc2cac99b0bd1f06d4 100644 (file)
--- a/mixer/gpu/host_buffer.cpp
+++ b/mixer/gpu/host_buffer.cpp
@@ -1,4 +1,4 @@
-#include "../../StdAfx.h"\r
+#include "../stdafx.h"\r
 \r
 #include "../gpu/host_buffer.h"\r
 \r

diff --git a/mixer/gpu/ogl_device.cpp b/mixer/gpu/ogl_device.cpp
index 0277e34d46511b67498a88a300e745af5cf9f77a..671a801ca215cb449f3c421404bac390b8e038ad 100644 (file)
--- a/mixer/gpu/ogl_device.cpp
+++ b/mixer/gpu/ogl_device.cpp
@@ -1,4 +1,4 @@
-#include "../../stdafx.h"\r
+#include "../stdafx.h"\r
 \r
 #include "ogl_device.h"\r
 \r

diff --git a/mixer/image/image_kernel.cpp b/mixer/image/image_kernel.cpp
index 948dcb8c3707a431e530f254748c1989913eaacf..6377db609848fccc95cf88d9732a7cdd976cd170 100644 (file)
--- a/mixer/image/image_kernel.cpp
+++ b/mixer/image/image_kernel.cpp
@@ -1,4 +1,4 @@
-#include "../../StdAfx.h"\r
+#include "../stdafx.h"\r
 \r
 #include "image_kernel.h"\r
 \r

diff --git a/mixer/image/image_mixer.cpp b/mixer/image/image_mixer.cpp
index a6c42e007d919f906a760eab68039becf5054769..931de2b77d3623512821349c019c89fd0d37aea1 100644 (file)
--- a/mixer/image/image_mixer.cpp
+++ b/mixer/image/image_mixer.cpp
@@ -1,4 +1,4 @@
-#include "../../StdAfx.h"\r
+#include "../stdafx.h"\r
 \r
 #include "image_mixer.h"\r
 #include "image_kernel.h"\r

diff --git a/mixer/image/image_mixer.h b/mixer/image/image_mixer.h
index 21fa3cf46abed0baeacdda234399d127c9b19b4c..075b7dcf3f94f958b920da0ea554e061e9095475 100644 (file)
--- a/mixer/image/image_mixer.h
+++ b/mixer/image/image_mixer.h
@@ -4,12 +4,11 @@
 \r
 #include <core/video_format.h>\r
 \r
-#include <boost/tuple/tuple.hpp>\r
-#include <boost/thread/future.hpp>\r
 #include <boost/noncopyable.hpp>\r
+#include <boost/thread/future.hpp>\r
 \r
 #include <memory>\r
-#include <array>\r
+#include <vector>\r
 \r
 namespace caspar { namespace core {\r
 \r

diff --git a/mixer/image/image_transform.cpp b/mixer/image/image_transform.cpp
index bfa73e50668005f85f30263b8aeaaece53ea28e8..7e3496a8f676a9d8a8261d0d1fa3d4bdcceb59d8 100644 (file)
--- a/mixer/image/image_transform.cpp
+++ b/mixer/image/image_transform.cpp
@@ -1,4 +1,4 @@
-#include "../../StdAfx.h"\r
+#include "../stdafx.h"\r
 \r
 #include "image_transform.h"\r
 \r

diff --git a/protocol/protocol.vcxproj b/protocol/protocol.vcxproj
index 051cd30cc589d371d42869df810195b35381b557..9c54b68a9f05c7039c6160ffad85ae6fba569a8e 100644 (file)
--- a/protocol/protocol.vcxproj
+++ b/protocol/protocol.vcxproj
@@ -17,6 +17,9 @@
     <ProjectReference Include="..\core\core.vcxproj">\r
       <Project>{79388c20-6499-4bf6-b8b9-d8c33d7d4ddd}</Project>\r
     </ProjectReference>\r
+    <ProjectReference Include="..\mixer\mixer.vcxproj">\r
+      <Project>{477e12a4-1b28-4ff7-b46d-76606bdd1891}</Project>\r
+    </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="amcp\AMCPCommand.h" />\r

diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj
index b4e01cbee499460af88cfd7202242c7711f5d74a..2dd3526f3ed4a0791392691da1e4e045a15f669a 100644 (file)
--- a/shell/shell.vcxproj
+++ b/shell/shell.vcxproj
@@ -24,6 +24,9 @@
     <ProjectReference Include="..\core\core.vcxproj">\r
       <Project>{79388c20-6499-4bf6-b8b9-d8c33d7d4ddd}</Project>\r
     </ProjectReference>\r
+    <ProjectReference Include="..\mixer\mixer.vcxproj">\r
+      <Project>{477e12a4-1b28-4ff7-b46d-76606bdd1891}</Project>\r
+    </ProjectReference>\r
     <ProjectReference Include="..\protocol\protocol.vcxproj">\r
       <Project>{2040b361-1fb6-488e-84a5-38a580da90de}</Project>\r
     </ProjectReference>\r