Mixxx

Merge lp://qastaging/~mixxxdevelopers/mixxx/features_xwax2_albert into lp://qastaging/~ywwg/mixxx/features_xwax2

features_xwax2_albert
Merge into features_xwax2

Proposed by Albert Santoni on 2010-11-08

Status:	Merged
Merged at revision:	2498
Proposed branch:	lp://qastaging/~mixxxdevelopers/mixxx/features_xwax2_albert
Merge into:	lp://qastaging/~ywwg/mixxx/features_xwax2
Diff against target:	1194 lines (+410/-452) 10 files modified mixxx/build/features.py (+4/-7) mixxx/lib/xwax/lut.cpp (+2/-2) mixxx/lib/xwax/pitch.h (+2/-0) mixxx/lib/xwax/timecoder.h (+2/-0) mixxx/lib/xwax/timecoder_win32.cpp (+333/-400) mixxx/src/controlpushbutton.cpp (+24/-37) mixxx/src/mathstuff.h (+8/-0) mixxx/src/soundmanager.cpp (+4/-0) mixxx/src/vinylcontrolxwax.cpp (+25/-3) mixxx/src/vinylcontrolxwax.h (+6/-3)
To merge this branch:	bzr merge lp://qastaging/~mixxxdevelopers/mixxx/features_xwax2_albert
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Owen Williams		2010-11-08	Approve on 2010-11-08
Review via email: mp+40303@code.qastaging.launchpad.net

Description of the change

- I reimplemented the thread safety fixes by changing our Mixxx code instead of xwax.
- I also did some semi-nasty stuff to make the xwax code compile on Windows with MSVC. The main trick I found was just renaming the .c files to .cpp to make the compiler think it's C++, which helps a lot since MSVC is missing C99.

lp://qastaging/~mixxxdevelopers/mixxx/features_xwax2_albert updated on 2010-11-08

2498. By Owen Williams <email address hidden> on 2010-11-08

* merge from lp:~mixxxdevelopers/mixxx/features_xwax2_albert:
* Fixed out-of-bounds array access in VinylControlXwax ringbuffer.
* Fixed MIDI buttons and keyboard buttons for most controllers.
* Renamed xwax files to .cpp to make Visual Studio compile them as C++. (This is easier than re-implementing missing C99 stuf$
* Instead of re-implementing re-entrancy modifications in xwax's timecoder, I wrapped the relevent code in a static mutex, wh$
* New xwax vinyl control code compiles on Windows now

* also update xwax to 0.8
* fix compilation under linux (as opposed to windows)

Revision history for this message

Owen Williams (ywwg) wrote on 2010-11-08:

Branch merged. I updated xwax to 0.8 and reimplemented the changes you made. I also made changes because it wasn't building on linux any more. I think now that it should build on both windows and linux.

review: Approve

Revision history for this message

Albert Santoni (gamegod) wrote on 2010-11-09:

Awesome, thanks Owen!

I'll test the compile on Windows to make sure it still works there too.

Albert

On Mon, Nov 8, 2010 at 1:01 PM, Owen Williams <email address hidden> wrote:
> Review: Approve
> Branch merged. I updated xwax to 0.8 and reimplemented the changes you made. I also made changes because it wasn't building on linux any more. I think now that it should build on both windows and linux.
> --
> https://code.launchpad.net/~mixxxdevelopers/mixxx/features_xwax2_albert/+merge/40303
> Your team Mixxx Development Team is subscribed to branch lp:~mixxxdevelopers/mixxx/features_xwax2_albert.
>