Mixxx

Merge lp://qastaging/~mixxxdevelopers/mixxx/SoundTouchUpgrade into lp://qastaging/~mixxxdevelopers/mixxx/trunk

SoundTouchUpgrade
Merge into trunk

Proposed by Sean M. Pappalardo on 2010-11-22

Status:	Merged
Merged at revision:	2648
Proposed branch:	lp://qastaging/~mixxxdevelopers/mixxx/SoundTouchUpgrade
Merge into:	lp://qastaging/~mixxxdevelopers/mixxx/trunk
Diff against target:	16339 lines (+8040/-8002) 58 files modified mixxx/build/depends.py (+1/-1) mixxx/lib/soundtouch-1.4.1/3dnow_win.cpp (+0/-349) mixxx/lib/soundtouch-1.4.1/AAFilter.cpp (+0/-184) mixxx/lib/soundtouch-1.4.1/AAFilter.h (+0/-91) mixxx/lib/soundtouch-1.4.1/BPMDetect.cpp (+0/-308) mixxx/lib/soundtouch-1.4.1/BPMDetect.h (+0/-161) mixxx/lib/soundtouch-1.4.1/COPYING.TXT (+0/-458) mixxx/lib/soundtouch-1.4.1/FIFOSampleBuffer.cpp (+0/-262) mixxx/lib/soundtouch-1.4.1/FIFOSampleBuffer.h (+0/-174) mixxx/lib/soundtouch-1.4.1/FIFOSamplePipe.h (+0/-217) mixxx/lib/soundtouch-1.4.1/FIRFilter.cpp (+0/-269) mixxx/lib/soundtouch-1.4.1/FIRFilter.h (+0/-164) mixxx/lib/soundtouch-1.4.1/PeakFinder.cpp (+0/-239) mixxx/lib/soundtouch-1.4.1/PeakFinder.h (+0/-93) mixxx/lib/soundtouch-1.4.1/README.html (+0/-725) mixxx/lib/soundtouch-1.4.1/RateTransposer.cpp (+0/-628) mixxx/lib/soundtouch-1.4.1/RateTransposer.h (+0/-159) mixxx/lib/soundtouch-1.4.1/STTypes.h (+0/-148) mixxx/lib/soundtouch-1.4.1/SoundTouch.cpp (+0/-480) mixxx/lib/soundtouch-1.4.1/SoundTouch.h (+0/-252) mixxx/lib/soundtouch-1.4.1/TDStretch.cpp (+0/-1044) mixxx/lib/soundtouch-1.4.1/TDStretch.h (+0/-275) mixxx/lib/soundtouch-1.4.1/VERSION (+0/-1) mixxx/lib/soundtouch-1.4.1/cpu_detect.h (+0/-62) mixxx/lib/soundtouch-1.4.1/cpu_detect_x64_gcc.cpp (+0/-80) mixxx/lib/soundtouch-1.4.1/cpu_detect_x64_win.cpp (+0/-85) mixxx/lib/soundtouch-1.4.1/cpu_detect_x86_gcc.cpp (+0/-135) mixxx/lib/soundtouch-1.4.1/cpu_detect_x86_win.cpp (+0/-129) mixxx/lib/soundtouch-1.4.1/mmx_optimized.cpp (+0/-320) mixxx/lib/soundtouch-1.4.1/sse_optimized.cpp (+0/-509) mixxx/lib/soundtouch-1.5.0/3dnow_win.cpp (+349/-0) mixxx/lib/soundtouch-1.5.0/AAFilter.cpp (+184/-0) mixxx/lib/soundtouch-1.5.0/AAFilter.h (+91/-0) mixxx/lib/soundtouch-1.5.0/BPMDetect.cpp (+308/-0) mixxx/lib/soundtouch-1.5.0/BPMDetect.h (+161/-0) mixxx/lib/soundtouch-1.5.0/COPYING.TXT (+458/-0) mixxx/lib/soundtouch-1.5.0/FIFOSampleBuffer.cpp (+262/-0) mixxx/lib/soundtouch-1.5.0/FIFOSampleBuffer.h (+174/-0) mixxx/lib/soundtouch-1.5.0/FIFOSamplePipe.h (+221/-0) mixxx/lib/soundtouch-1.5.0/FIRFilter.cpp (+269/-0) mixxx/lib/soundtouch-1.5.0/FIRFilter.h (+164/-0) mixxx/lib/soundtouch-1.5.0/PeakFinder.cpp (+239/-0) mixxx/lib/soundtouch-1.5.0/PeakFinder.h (+93/-0) mixxx/lib/soundtouch-1.5.0/README.html (+752/-0) mixxx/lib/soundtouch-1.5.0/RateTransposer.cpp (+628/-0) mixxx/lib/soundtouch-1.5.0/RateTransposer.h (+159/-0) mixxx/lib/soundtouch-1.5.0/STTypes.h (+154/-0) mixxx/lib/soundtouch-1.5.0/SoundTouch.cpp (+480/-0) mixxx/lib/soundtouch-1.5.0/SoundTouch.h (+252/-0) mixxx/lib/soundtouch-1.5.0/TDStretch.cpp (+1045/-0) mixxx/lib/soundtouch-1.5.0/TDStretch.h (+275/-0) mixxx/lib/soundtouch-1.5.0/cpu_detect.h (+62/-0) mixxx/lib/soundtouch-1.5.0/cpu_detect_x64_gcc.cpp (+80/-0) mixxx/lib/soundtouch-1.5.0/cpu_detect_x64_win.cpp (+85/-0) mixxx/lib/soundtouch-1.5.0/cpu_detect_x86_gcc.cpp (+135/-0) mixxx/lib/soundtouch-1.5.0/cpu_detect_x86_win.cpp (+129/-0) mixxx/lib/soundtouch-1.5.0/mmx_optimized.cpp (+320/-0) mixxx/lib/soundtouch-1.5.0/sse_optimized.cpp (+510/-0)
To merge this branch:	bzr merge lp://qastaging/~mixxxdevelopers/mixxx/SoundTouchUpgrade
Related bugs:	Link a bug report
Related blueprints:	SoundTouch 1.5.0 Upgrade (Low)

Reviewer	Review Type	Date Requested	Status
Albert Santoni		2010-11-22	Approve on 2011-02-01
Review via email: mp+41433@code.qastaging.launchpad.net

Description of the change

SoundTouch 1.5.0 fixes a few bugs that are relevant to us (see the branch description) and is a drop-in replacement for 1.4.1. The only actual code change to Mixxx was changing the directory name, so there's not much to review. (I was very tempted to just commit this to trunk as a result.)

Revision history for this message

Albert Santoni (gamegod) wrote on 2011-02-01:

Just filed a blueprint and linked this so we can track these types of changes easier in the future. (It now shows up as something we targeted for 1.10 on Launchpad.)

Approving, we'll see if anything breaks.

review: Approve

Revision history for this message

RJ Skerry-Ryan (rryan) wrote on 2011-02-11:

Hey Sean,

Thanks for putting this together. Hm, I tried building on Linux and it fails because lib/soundtouch-1.5.0/soundtouch_config.h is missing.

Also, this doesn't look like a vanilla SoundTouch 1.5.0 since it includes your cpu_detect_x64 modifications. It's all in one commit message. Are the files completely clean from 1.5.0 except for the addition of cpu_detect_x64* ? It would be nice if the clean commit and then our customizations were in 2 commits instead of one, but not a huge deal.

Revision history for this message

Sean M. Pappalardo (pegasus-renegadetech) wrote on 2011-02-11:

You're correct. This is straight ST 1.5.0 code plus that one x64 detect file which is unchanged from 1.8.x.

lp://qastaging/~mixxxdevelopers/mixxx/SoundTouchUpgrade updated on 2011-02-22

2565. By Sean M. Pappalardo on 2011-02-22: Added missing soundtouch_config.h file. Fixes compiling on GCC.
2566. By Sean M. Pappalardo on 2011-02-22: Whoops. Didn't need that header file. Patched STTypes.h to look like the previous one. Tests good.