diff options
| -rw-r--r-- | project/VS2010Express/XBMC for Windows.sln | 20 | ||||
| -rw-r--r-- | project/VS2010Express/XBMC.vcxproj | 22 | ||||
| -rw-r--r-- | project/VS2010Express/XBMC.vcxproj.filters | 68 | ||||
| -rw-r--r-- | xbmc/cores/AudioEngine/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | xbmc/cores/AudioEngine/Makefile.in | 10 |
5 files changed, 72 insertions, 68 deletions
diff --git a/project/VS2010Express/XBMC for Windows.sln b/project/VS2010Express/XBMC for Windows.sln index e2c0c6584a..a833f8503b 100644 --- a/project/VS2010Express/XBMC for Windows.sln +++ b/project/VS2010Express/XBMC for Windows.sln @@ -1,11 +1,21 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.25402.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Kodi", "XBMC.vcxproj", "{3A68081D-E8F9-4523-9436-530DE9E5530A}" ProjectSection(ProjectDependencies) = postProject + {F8F1290B-1188-4810-86C9-88178A31D2AF} = {F8F1290B-1188-4810-86C9-88178A31D2AF} + {2DCEA60B-4EBC-4DB7-9FBD-297C1EFD95D7} = {2DCEA60B-4EBC-4DB7-9FBD-297C1EFD95D7} + {FEA71D39-CB68-486B-A978-246E661A3F89} = {FEA71D39-CB68-486B-A978-246E661A3F89} + {44F93C4D-85DD-4452-99BB-F1D196174024} = {44F93C4D-85DD-4452-99BB-F1D196174024} + {88968763-3D6B-48A8-B495-CC8C187FAC02} = {88968763-3D6B-48A8-B495-CC8C187FAC02} {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} + {6B96FD7D-26EE-415B-8858-27757A0B1273} = {6B96FD7D-26EE-415B-8858-27757A0B1273} {DF460EAB-570D-4B50-9089-2E2FC801BF38} = {DF460EAB-570D-4B50-9089-2E2FC801BF38} + {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} + {8BC9CEB8-8B4A-11D0-8D11-00A0CFEBC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0CFEBC942} + {AD20A3E2-09CB-42DB-9A70-27F7CDC886CE} = {AD20A3E2-09CB-42DB-9A70-27F7CDC886CE} + {6D8C91F8-992F-4C83-9DE3-485D64EF8420} = {6D8C91F8-992F-4C83-9DE3-485D64EF8420} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libPlatinum", "libPlatinum.vcxproj", "{B2975495-FBE4-4F94-AAC5-B21A9842BF50}" @@ -74,12 +84,6 @@ Global {AD20A3E2-09CB-42DB-9A70-27F7CDC886CE}.Debug|Win32.Build.0 = Debug (DLL)|Win32 {AD20A3E2-09CB-42DB-9A70-27F7CDC886CE}.Release|Win32.ActiveCfg = Release (DLL)|Win32 {AD20A3E2-09CB-42DB-9A70-27F7CDC886CE}.Release|Win32.Build.0 = Release (DLL)|Win32 - {6A8518C3-D81A-4428-BD7F-C37933088AC1}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32 - {6A8518C3-D81A-4428-BD7F-C37933088AC1}.Debug Testsuite|Win32.Build.0 = Debug|Win32 - {6A8518C3-D81A-4428-BD7F-C37933088AC1}.Debug|Win32.ActiveCfg = Debug|Win32 - {6A8518C3-D81A-4428-BD7F-C37933088AC1}.Debug|Win32.Build.0 = Debug|Win32 - {6A8518C3-D81A-4428-BD7F-C37933088AC1}.Release|Win32.ActiveCfg = Release|Win32 - {6A8518C3-D81A-4428-BD7F-C37933088AC1}.Release|Win32.Build.0 = Release|Win32 {88968763-3D6B-48A8-B495-CC8C187FAC02}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32 {88968763-3D6B-48A8-B495-CC8C187FAC02}.Debug Testsuite|Win32.Build.0 = Debug|Win32 {88968763-3D6B-48A8-B495-CC8C187FAC02}.Debug|Win32.ActiveCfg = Debug|Win32 diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index ee9fcfd8a2..164b608f77 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -258,11 +258,6 @@ copy "..\Win32BuildSetup\dependencies\python27.dll" "$(TargetDir)"</Command> <ClCompile Include="..\..\xbmc\cores\AudioEngine\AEFactory.cpp" /> <ClCompile Include="..\..\xbmc\cores\AudioEngine\AEResampleFactory.cpp" /> <ClCompile Include="..\..\xbmc\cores\AudioEngine\AESinkFactory.cpp" /> - <ClCompile Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSP.cpp" /> - <ClCompile Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSPAddon.cpp" /> - <ClCompile Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSPDatabase.cpp" /> - <ClCompile Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSPMode.cpp" /> - <ClCompile Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSPProcess.cpp" /> <ClCompile Include="..\..\xbmc\cores\AudioEngine\Encoders\AEEncoderFFmpeg.cpp" /> <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAE.cpp" /> <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAEBuffer.cpp" /> @@ -270,6 +265,11 @@ copy "..\Win32BuildSetup\dependencies\python27.dll" "$(TargetDir)"</Command> <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAESink.cpp" /> <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAESound.cpp" /> <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAEStream.cpp" /> + <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSP.cpp" /> + <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSPAddon.cpp" /> + <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSPDatabase.cpp" /> + <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSPMode.cpp" /> + <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSPProcess.cpp" /> <ClCompile Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkDirectSound.cpp" /> <ClCompile Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkNULL.cpp" /> <ClCompile Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkWASAPI.cpp" /> @@ -1021,11 +1021,11 @@ copy "..\Win32BuildSetup\dependencies\python27.dll" "$(TargetDir)"</Command> <ClInclude Include="..\..\xbmc\contrib\kissfft\kiss_fft.h" /> <ClInclude Include="..\..\xbmc\contrib\kissfft\kiss_fftr.h" /> <ClInclude Include="..\..\xbmc\contrib\kissfft\_kiss_fft_guts.h" /> - <ClInclude Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSP.h" /> - <ClInclude Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSPAddon.h" /> - <ClInclude Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSPDatabase.h" /> - <ClInclude Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSPMode.h" /> - <ClInclude Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSPProcess.h" /> + <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSP.h" /> + <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSPAddon.h" /> + <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSPDatabase.h" /> + <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSPMode.h" /> + <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSPProcess.h" /> <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEStreamData.h" /> <ClInclude Include="..\..\xbmc\cores\DataCacheCore.h" /> <ClInclude Include="..\..\xbmc\cores\AudioEngine\AEFactory.h" /> @@ -3141,4 +3141,4 @@ copy "..\Win32BuildSetup\dependencies\python27.dll" "$(TargetDir)"</Command> </VisualStudio> </ProjectExtensions> <Import Project="$(SolutionDir)\$(ProjectFileName).targets.user" Condition="Exists('$(SolutionDir)\$(ProjectFileName).targets.user')" /> -</Project> +</Project>
\ No newline at end of file diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index 2b635cf359..b3c5378881 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -319,9 +319,6 @@ <Filter Include="cores\VideoPlayer\DVDCodecs\Overlay\contrib"> <UniqueIdentifier>{43526341-7b96-462d-9f71-685e426251ec}</UniqueIdentifier> </Filter> - <Filter Include="cores\AudioEngine\DSPAddons"> - <UniqueIdentifier>{2afb92ce-e9ac-4458-80e7-3384ccfffa3c}</UniqueIdentifier> - </Filter> <Filter Include="network\test"> <UniqueIdentifier>{1bdb0045-3341-49b7-8d6f-30a53f812350}</UniqueIdentifier> </Filter> @@ -448,6 +445,9 @@ <Filter Include="games\controllers\windows"> <UniqueIdentifier>{9e3dd585-08e1-4dae-bc21-05e49697ef94}</UniqueIdentifier> </Filter> + <Filter Include="cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons"> + <UniqueIdentifier>{c6256fb3-a4b8-4114-95c1-eb601756759a}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\xbmc\win32\pch.cpp"> @@ -2830,6 +2830,21 @@ <ClCompile Include="..\..\xbmc\network\httprequesthandler\HTTPRequestHandlerUtils.cpp"> <Filter>network\httprequesthandler</Filter> </ClCompile> + <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSPAddon.cpp"> + <Filter>cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons</Filter> + </ClCompile> + <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSPDatabase.cpp"> + <Filter>cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons</Filter> + </ClCompile> + <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSPMode.cpp"> + <Filter>cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons</Filter> + </ClCompile> + <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSPProcess.cpp"> + <Filter>cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons</Filter> + </ClCompile> + <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSP.cpp"> + <Filter>cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\xbmc\media\MediaType.cpp"> @@ -2902,21 +2917,6 @@ <ClCompile Include="..\..\xbmc\settings\AudioDSPSettings.cpp"> <Filter>settings</Filter> </ClCompile> - <ClCompile Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSP.cpp"> - <Filter>cores\AudioEngine\DSPAddons</Filter> - </ClCompile> - <ClCompile Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSPAddon.cpp"> - <Filter>cores\AudioEngine\DSPAddons</Filter> - </ClCompile> - <ClCompile Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSPDatabase.cpp"> - <Filter>cores\AudioEngine\DSPAddons</Filter> - </ClCompile> - <ClCompile Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSPMode.cpp"> - <Filter>cores\AudioEngine\DSPAddons</Filter> - </ClCompile> - <ClCompile Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSPProcess.cpp"> - <Filter>cores\AudioEngine\DSPAddons</Filter> - </ClCompile> <ClCompile Include="..\..\xbmc\utils\HttpRangeUtils.cpp"> <Filter>utils</Filter> </ClCompile> @@ -6041,21 +6041,6 @@ <ClInclude Include="..\..\xbmc\settings\AudioDSPSettings.h"> <Filter>settings</Filter> </ClInclude> - <ClInclude Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSP.h"> - <Filter>cores\AudioEngine\DSPAddons</Filter> - </ClInclude> - <ClInclude Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSPAddon.h"> - <Filter>cores\AudioEngine\DSPAddons</Filter> - </ClInclude> - <ClInclude Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSPDatabase.h"> - <Filter>cores\AudioEngine\DSPAddons</Filter> - </ClInclude> - <ClInclude Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSPMode.h"> - <Filter>cores\AudioEngine\DSPAddons</Filter> - </ClInclude> - <ClInclude Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSPProcess.h"> - <Filter>cores\AudioEngine\DSPAddons</Filter> - </ClInclude> <ClInclude Include="..\..\xbmc\addons\DllAudioDSP.h"> <Filter>addons</Filter> </ClInclude> @@ -6704,6 +6689,21 @@ <ClInclude Include="..\..\xbmc\network\httprequesthandler\HTTPRequestHandlerUtils.h"> <Filter>network\httprequesthandler</Filter> </ClInclude> + <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSPAddon.h"> + <Filter>cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons</Filter> + </ClInclude> + <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSPDatabase.h"> + <Filter>cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons</Filter> + </ClInclude> + <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSPMode.h"> + <Filter>cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons</Filter> + </ClInclude> + <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSPProcess.h"> + <Filter>cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons</Filter> + </ClInclude> + <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons\ActiveAEDSP.h"> + <Filter>cores\AudioEngine\Engines\ActiveAE\AudioDSPAddons</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc"> @@ -6790,4 +6790,4 @@ <Filter>shaders</Filter> </FxCompile> </ItemGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/xbmc/cores/AudioEngine/CMakeLists.txt b/xbmc/cores/AudioEngine/CMakeLists.txt index 8f840accdd..41190ad389 100644 --- a/xbmc/cores/AudioEngine/CMakeLists.txt +++ b/xbmc/cores/AudioEngine/CMakeLists.txt @@ -1,11 +1,11 @@ set(SOURCES AEFactory.cpp AEResampleFactory.cpp AESinkFactory.cpp - DSPAddons/ActiveAEDSP.cpp - DSPAddons/ActiveAEDSPAddon.cpp - DSPAddons/ActiveAEDSPDatabase.cpp - DSPAddons/ActiveAEDSPMode.cpp - DSPAddons/ActiveAEDSPProcess.cpp + Engines/ActiveAE/AudioDSPAddons/ActiveAEDSP.cpp + Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPAddon.cpp + Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPDatabase.cpp + Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPMode.cpp + Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPProcess.cpp Encoders/AEEncoderFFmpeg.cpp Engines/ActiveAE/ActiveAE.cpp Engines/ActiveAE/ActiveAEBuffer.cpp @@ -25,11 +25,11 @@ set(SOURCES AEFactory.cpp set(HEADERS AEFactory.h AEResampleFactory.h AESinkFactory.h - DSPAddons/ActiveAEDSP.h - DSPAddons/ActiveAEDSPAddon.h - DSPAddons/ActiveAEDSPDatabase.h - DSPAddons/ActiveAEDSPMode.h - DSPAddons/ActiveAEDSPProcess.h + Engines/ActiveAE/AudioDSPAddons/ActiveAEDSP.h + Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPAddon.h + Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPDatabase.h + Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPMode.h + Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPProcess.h Encoders/AEEncoderFFmpeg.h Engines/ActiveAE/ActiveAE.h Engines/ActiveAE/ActiveAEBuffer.h diff --git a/xbmc/cores/AudioEngine/Makefile.in b/xbmc/cores/AudioEngine/Makefile.in index 7aab111f81..4167eec9da 100644 --- a/xbmc/cores/AudioEngine/Makefile.in +++ b/xbmc/cores/AudioEngine/Makefile.in @@ -57,11 +57,11 @@ SRCS += Sinks/AESinkPULSE.cpp endif endif -SRCS += DSPAddons/ActiveAEDSP.cpp -SRCS += DSPAddons/ActiveAEDSPMode.cpp -SRCS += DSPAddons/ActiveAEDSPAddon.cpp -SRCS += DSPAddons/ActiveAEDSPDatabase.cpp -SRCS += DSPAddons/ActiveAEDSPProcess.cpp +SRCS += Engines/ActiveAE/AudioDSPAddons/ActiveAEDSP.cpp +SRCS += Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPMode.cpp +SRCS += Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPAddon.cpp +SRCS += Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPDatabase.cpp +SRCS += Engines/ActiveAE/AudioDSPAddons/ActiveAEDSPProcess.cpp SRCS += Utils/AEChannelInfo.cpp SRCS += Utils/AEBuffer.cpp |