diff options
author | Memphiz <memphis@machzwo.de> | 2015-05-10 18:01:12 +0200 |
---|---|---|
committer | Memphiz <memphis@machzwo.de> | 2015-05-10 19:38:27 +0200 |
commit | 55ced24d62130359c5771fdc9b389fd3684257ba (patch) | |
tree | b614b3ef66c905b91fdeea56b208027e1af96aa2 /project | |
parent | 8492850b3fb1d670941ca9a3fc96d1d9b541aa4e (diff) |
[fft/viz] - replaced our buggy fft implementation with rfft
Diffstat (limited to 'project')
-rw-r--r-- | project/VS2010Express/XBMC.vcxproj | 23 | ||||
-rw-r--r-- | project/VS2010Express/XBMC.vcxproj.filters | 39 |
2 files changed, 47 insertions, 15 deletions
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index cb64dd5df2..fe85f462b1 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -200,6 +200,14 @@ <ClCompile Include="..\..\xbmc\BackgroundInfoLoader.cpp" /> <ClCompile Include="..\..\xbmc\CompileInfo.cpp" /> <ClCompile Include="..\..\xbmc\ContextMenuManager.cpp" /> + <ClCompile Include="..\..\xbmc\contrib\kissfft\kiss_fft.c"> + <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs> + <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs> + </ClCompile> + <ClCompile Include="..\..\xbmc\contrib\kissfft\kiss_fftr.c"> + <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs> + <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs> + </ClCompile> <ClCompile Include="..\..\xbmc\cores\AudioEngine\AEFactory.cpp" /> <ClCompile Include="..\..\xbmc\cores\AudioEngine\AEResampleFactory.cpp" /> <ClCompile Include="..\..\xbmc\cores\AudioEngine\AESinkFactory.cpp" /> @@ -826,6 +834,9 @@ <ClInclude Include="..\..\xbmc\ApplicationPlayer.h" /> <ClInclude Include="..\..\xbmc\AppParamParser.h" /> <ClInclude Include="..\..\xbmc\CompileInfo.h" /> + <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\DataCacheCore.h" /> <ClInclude Include="..\..\xbmc\cores\AudioEngine\AEFactory.h" /> <ClInclude Include="..\..\xbmc\cores\AudioEngine\AEResampleFactory.h" /> @@ -1024,6 +1035,7 @@ <ClInclude Include="..\..\xbmc\utils\Locale.h" /> <ClInclude Include="..\..\xbmc\utils\params_check_macros.h" /> <ClInclude Include="..\..\xbmc\utils\ProgressJob.h" /> + <ClInclude Include="..\..\xbmc\utils\rfft.h" /> <ClInclude Include="..\..\xbmc\utils\RssManager.h" /> <ClInclude Include="..\..\xbmc\utils\Speed.h" /> <ClInclude Include="..\..\xbmc\utils\StringValidation.h" /> @@ -1147,6 +1159,7 @@ <ClCompile Include="..\..\xbmc\utils\LegacyPathTranslation.cpp" /> <ClCompile Include="..\..\xbmc\utils\Locale.cpp" /> <ClCompile Include="..\..\xbmc\utils\ProgressJob.cpp" /> + <ClCompile Include="..\..\xbmc\utils\rfft.cpp" /> <ClCompile Include="..\..\xbmc\utils\RssManager.cpp" /> <ClCompile Include="..\..\xbmc\utils\Speed.cpp" /> <ClCompile Include="..\..\xbmc\utils\StringValidation.cpp" /> @@ -1159,6 +1172,10 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> </ClCompile> + <ClCompile Include="..\..\xbmc\utils\test\Testrfft.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + </ClCompile> <ClCompile Include="..\..\xbmc\utils\test\TestUrlOptions.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -1195,7 +1212,6 @@ <ClCompile Include="..\..\xbmc\utils\DatabaseUtils.cpp" /> <ClCompile Include="..\..\xbmc\utils\EndianSwap.cpp" /> <ClCompile Include="..\..\xbmc\utils\Fanart.cpp" /> - <ClCompile Include="..\..\xbmc\utils\fft.cpp" /> <ClCompile Include="..\..\xbmc\utils\FileOperationJob.cpp" /> <ClCompile Include="..\..\xbmc\utils\FileUtils.cpp" /> <ClCompile Include="..\..\xbmc\utils\fstrcmp.c"> @@ -1425,10 +1441,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> </ClCompile> - <ClCompile Include="..\..\xbmc\utils\test\Testfft.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - </ClCompile> <ClCompile Include="..\..\xbmc\utils\TimeSmoother.cpp" /> <ClCompile Include="..\..\xbmc\utils\TimeUtils.cpp" /> <ClCompile Include="..\..\xbmc\utils\URIUtils.cpp" /> @@ -2053,7 +2065,6 @@ <ClInclude Include="..\..\xbmc\utils\DatabaseUtils.h" /> <ClInclude Include="..\..\xbmc\utils\EndianSwap.h" /> <ClInclude Include="..\..\xbmc\utils\Fanart.h" /> - <ClInclude Include="..\..\xbmc\utils\fft.h" /> <ClInclude Include="..\..\xbmc\utils\FileOperationJob.h" /> <ClInclude Include="..\..\xbmc\utils\FileUtils.h" /> <ClInclude Include="..\..\xbmc\utils\fstrcmp.h" /> diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index 741d3d4f25..c858f329e2 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -334,6 +334,12 @@ <Filter Include="interfaces\legacy\wsgi"> <UniqueIdentifier>{4750236a-887e-40c1-af3e-1e095f5960e0}</UniqueIdentifier> </Filter> + <Filter Include="contrib"> + <UniqueIdentifier>{9c3139a5-4a8a-4533-af30-cd79ee250997}</UniqueIdentifier> + </Filter> + <Filter Include="contrib\kissfft"> + <UniqueIdentifier>{d811b1d1-5e81-4d89-9173-f02818c897ab}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\xbmc\win32\pch.cpp"> @@ -1387,9 +1393,6 @@ <ClCompile Include="..\..\xbmc\utils\Fanart.cpp"> <Filter>utils</Filter> </ClCompile> - <ClCompile Include="..\..\xbmc\utils\fft.cpp"> - <Filter>utils</Filter> - </ClCompile> <ClCompile Include="..\..\xbmc\utils\FileOperationJob.cpp"> <Filter>utils</Filter> </ClCompile> @@ -2371,9 +2374,6 @@ <ClCompile Include="..\..\xbmc\utils\test\Testfastmemcpy.cpp"> <Filter>utils\test</Filter> </ClCompile> - <ClCompile Include="..\..\xbmc\utils\test\Testfft.cpp"> - <Filter>utils\test</Filter> - </ClCompile> <ClCompile Include="..\..\xbmc\utils\test\TestFileOperationJob.cpp"> <Filter>utils\test</Filter> </ClCompile> @@ -3087,6 +3087,18 @@ <ClCompile Include="..\..\xbmc\test\TestUtil.cpp"> <Filter>test</Filter> </ClCompile> + <ClCompile Include="..\..\xbmc\utils\rfft.cpp"> + <Filter>utils</Filter> + </ClCompile> + <ClCompile Include="..\..\xbmc\utils\test\Testrfft.cpp"> + <Filter>utils\test</Filter> + </ClCompile> + <ClCompile Include="..\..\xbmc\contrib\kissfft\kiss_fft.c"> + <Filter>contrib\kissfft</Filter> + </ClCompile> + <ClCompile Include="..\..\xbmc\contrib\kissfft\kiss_fftr.c"> + <Filter>contrib\kissfft</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\xbmc\win32\pch.h"> @@ -4297,9 +4309,6 @@ <ClInclude Include="..\..\xbmc\utils\Fanart.h"> <Filter>utils</Filter> </ClInclude> - <ClInclude Include="..\..\xbmc\utils\fft.h"> - <Filter>utils</Filter> - </ClInclude> <ClInclude Include="..\..\xbmc\utils\FileOperationJob.h"> <Filter>utils</Filter> </ClInclude> @@ -5971,6 +5980,18 @@ <ClInclude Include="..\..\xbmc\music\EmbeddedArt.h"> <Filter>music</Filter> </ClInclude> + <ClInclude Include="..\..\xbmc\utils\rfft.h"> + <Filter>utils</Filter> + </ClInclude> + <ClInclude Include="..\..\xbmc\contrib\kissfft\_kiss_fft_guts.h"> + <Filter>contrib\kissfft</Filter> + </ClInclude> + <ClInclude Include="..\..\xbmc\contrib\kissfft\kiss_fft.h"> + <Filter>contrib\kissfft</Filter> + </ClInclude> + <ClInclude Include="..\..\xbmc\contrib\kissfft\kiss_fftr.h"> + <Filter>contrib\kissfft</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc"> |