← Back to branch summary

~ywwg/mixxx/features_passthrough

~ywwg/mixxx/features_passthrough

Viewing all changes in revision 2617.

Committer: Owen Williams
Date: 2011-04-16 02:35:22 UTC
Revision ID: owen@ywwg.com-20110416023522-5x96py17vlbs1sqd

* merge bill's trunk merge fixes from lp:~mixxxdevelopers/mixxx/features_xwax2_bill
by way of features_xwax2 -c 2637

files added:
mixxx/src/circularbuffer.h

mixxx/src/engine/enginedeck.cpp

mixxx/src/engine/enginedeck.h

mixxx/src/engine/enginemicrophone.cpp

mixxx/src/engine/enginemicrophone.h

mixxx/src/engine/enginepassthrough.cpp

mixxx/src/engine/enginepassthrough.h

mixxx/src/test/enginemicrophonetest.cpp

files renamed:
mixxx/src/audiopath.cpp => mixxx/src/soundmanagerutil.cpp

mixxx/src/audiopath.h => mixxx/src/soundmanagerutil.h

files modified:
mixxx/build/depends.py

mixxx/lib/xwax/timecoder.c

mixxx/lib/xwax/timecoder.h

mixxx/src/basetrackplayer.cpp

mixxx/src/dlgpreferences.cpp

mixxx/src/dlgpreferences.h

mixxx/src/dlgprefsound.cpp

mixxx/src/dlgprefsound.h

mixxx/src/dlgprefsounditem.h

mixxx/src/engine/enginechannel.cpp

mixxx/src/engine/enginechannel.h

mixxx/src/engine/enginemaster.cpp

mixxx/src/engine/enginemaster.h

mixxx/src/mixxx.cpp

mixxx/src/mixxx.h

mixxx/src/sounddevice.cpp

mixxx/src/sounddeviceportaudio.cpp

mixxx/src/soundmanager.cpp

mixxx/src/soundmanager.h

mixxx/src/soundmanagerconfig.cpp

mixxx/src/soundmanagerconfig.h

mixxx/src/test/enginemastertest.cpp

mixxx/src/vinylcontrol.h

mixxx/src/vinylcontrolproxy.cpp

mixxx/src/vinylcontrolproxy.h

mixxx/src/vinylcontrolxwax.cpp

mixxx/src/vinylcontrolxwax.h

Show diffs side-by-side

added added

removed removed

mixxx/build/depends.py

mixxx/lib/xwax/timecoder.c

mixxx/lib/xwax/timecoder.h

mixxx/src/basetrackplayer.cpp

mixxx/src/circularbuffer.h

mixxx/src/dlgpreferences.cpp

mixxx/src/dlgpreferences.h

mixxx/src/dlgprefsound.cpp

mixxx/src/dlgprefsound.h

mixxx/src/dlgprefsounditem.h

mixxx/src/engine/enginechannel.cpp

mixxx/src/engine/enginechannel.h

mixxx/src/engine/enginedeck.cpp

mixxx/src/engine/enginedeck.h

mixxx/src/engine/enginemaster.cpp

mixxx/src/engine/enginemaster.h

mixxx/src/engine/enginemicrophone.cpp

mixxx/src/engine/enginemicrophone.h

mixxx/src/engine/enginepassthrough.cpp

mixxx/src/engine/enginepassthrough.h

mixxx/src/mixxx.cpp

mixxx/src/mixxx.h

mixxx/src/sounddevice.cpp

mixxx/src/sounddeviceportaudio.cpp

mixxx/src/soundmanager.cpp

mixxx/src/soundmanager.h

mixxx/src/soundmanagerconfig.cpp

mixxx/src/soundmanagerconfig.h

mixxx/src/soundmanagerutil.cpp

mixxx/src/soundmanagerutil.h

mixxx/src/test/enginemastertest.cpp

mixxx/src/test/enginemicrophonetest.cpp

mixxx/src/vinylcontrol.h

mixxx/src/vinylcontrolproxy.cpp

mixxx/src/vinylcontrolproxy.h

mixxx/src/vinylcontrolxwax.cpp

mixxx/src/vinylcontrolxwax.h

Older »