Matthew Parlane 9de7611ff9 Merge branch 'master' into wii-network ...

Conflicts:
	CMakeLists.txt
	Source/Core/Core/Core.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj.filters
	Source/Dolphin_2010.sln
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props

2013-08-16 19:17:07 +12:00

..

AAFilter.cpp

update soundtouch to svn revision 173

2013-06-22 20:19:27 +02:00

AAFilter.h

update soundtouch to svn revision 173

2013-06-22 20:19:27 +02:00

BPMDetect.cpp

update soundtouch to svn revision 173

2013-06-22 20:19:27 +02:00

BPMDetect.h

update soundtouch to svn revision 173

2013-06-22 20:19:27 +02:00

CMakeLists.txt

Fix include paths and compiling in Linux. Externals soundtouch is 1.7.1, while Ubuntu 12.10 is 1.6.x. Externals soundtouch is compiled with integer samples, while ubuntu is compiled with float samples. Float samples is probably the more common route. If you're going to use soundtouch, you should probably use SAMPLETYPE instead of explicitly choosing short. This probably breaks the windows build since its includes aren't setup.

2013-01-09 10:26:12 -06:00

cpu_detect_x86.cpp

update soundtouch to svn revision 173

2013-06-22 20:19:27 +02:00

cpu_detect.h

update soundtouch to svn revision 173

2013-06-22 20:19:27 +02:00

FIFOSampleBuffer.cpp

update soundtouch to svn revision 173

2013-06-22 20:19:27 +02:00

FIFOSampleBuffer.h

update soundtouch to svn revision 173

2013-06-22 20:19:27 +02:00

FIFOSamplePipe.h

update soundtouch to svn revision 173

2013-06-22 20:19:27 +02:00

FIRFilter.cpp

forgot to add free() to the previous malloc change

2013-06-23 00:14:45 +02:00

FIRFilter.h

update soundtouch to svn revision 173

2013-06-22 20:19:27 +02:00

mmx_optimized.cpp

update soundtouch to svn revision 173

2013-06-22 20:19:27 +02:00

PeakFinder.cpp

update soundtouch to svn revision 173

2013-06-22 20:19:27 +02:00

PeakFinder.h

update soundtouch to svn revision 173

2013-06-22 20:19:27 +02:00

RateTransposer.cpp

update soundtouch to svn revision 173

2013-06-22 20:19:27 +02:00

RateTransposer.h

update soundtouch to svn revision 173

2013-06-22 20:19:27 +02:00

SoundTouch.cpp

forgot to add free() to the previous malloc change

2013-06-23 00:14:45 +02:00

SoundTouch.h

update soundtouch to svn revision 173

2013-06-22 20:19:27 +02:00

SoundTouch.vcxproj

Replace OpenSSL with PolarSSL

2013-08-15 20:47:47 +12:00

SoundTouch.vcxproj.filters

Fix include paths and compiling in Linux. Externals soundtouch is 1.7.1, while Ubuntu 12.10 is 1.6.x. Externals soundtouch is compiled with integer samples, while ubuntu is compiled with float samples. Float samples is probably the more common route. If you're going to use soundtouch, you should probably use SAMPLETYPE instead of explicitly choosing short. This probably breaks the windows build since its includes aren't setup.

2013-01-09 10:26:12 -06:00

sse_optimized.cpp

update soundtouch to svn revision 173

2013-06-22 20:19:27 +02:00

STTypes.h

fix deb-x64 and osx-x64 builds after soundtouch update

2013-06-22 21:51:11 +02:00

TDStretch.cpp

update soundtouch to svn revision 173

2013-06-22 20:19:27 +02:00

TDStretch.h

update soundtouch to svn revision 173

2013-06-22 20:19:27 +02:00