Merge lp://qastaging/~mixxxdevelopers/mixxx/features_external_mixer into lp://qastaging/~mixxxdevelopers/mixxx/trunk
Proposed by
RJ Skerry-Ryan
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 2748 | ||||||||
Proposed branch: | lp://qastaging/~mixxxdevelopers/mixxx/features_external_mixer | ||||||||
Merge into: | lp://qastaging/~mixxxdevelopers/mixxx/trunk | ||||||||
Diff against target: |
2253 lines (+1105/-290) 37 files modified
mixxx/build/depends.py (+6/-1) mixxx/lib/xwax/timecoder.c (+1/-1) mixxx/lib/xwax/timecoder.h (+1/-1) mixxx/src/basetrackplayer.cpp (+3/-2) mixxx/src/circularbuffer.h (+97/-0) mixxx/src/dlgpreferences.cpp (+3/-3) mixxx/src/dlgpreferences.h (+4/-1) mixxx/src/dlgprefsound.cpp (+100/-65) mixxx/src/dlgprefsound.h (+9/-3) mixxx/src/dlgprefsounditem.h (+3/-1) mixxx/src/engine/enginechannel.cpp (+9/-53) mixxx/src/engine/enginechannel.h (+13/-18) mixxx/src/engine/enginedeck.cpp (+76/-0) mixxx/src/engine/enginedeck.h (+59/-0) mixxx/src/engine/enginemaster.cpp (+46/-12) mixxx/src/engine/enginemaster.h (+9/-7) mixxx/src/engine/enginemicrophone.cpp (+125/-0) mixxx/src/engine/enginemicrophone.h (+53/-0) mixxx/src/engine/enginepassthrough.cpp (+119/-0) mixxx/src/engine/enginepassthrough.h (+51/-0) mixxx/src/mixxx.cpp (+19/-5) mixxx/src/mixxx.h (+0/-2) mixxx/src/sounddevice.cpp (+1/-1) mixxx/src/sounddeviceportaudio.cpp (+1/-1) mixxx/src/soundmanager.cpp (+70/-38) mixxx/src/soundmanager.h (+14/-4) mixxx/src/soundmanagerconfig.cpp (+1/-1) mixxx/src/soundmanagerconfig.h (+2/-2) mixxx/src/soundmanagerutil.cpp (+6/-17) mixxx/src/soundmanagerutil.h (+21/-6) mixxx/src/test/enginemastertest.cpp (+29/-39) mixxx/src/test/enginemicrophonetest.cpp (+136/-0) mixxx/src/vinylcontrol.h (+1/-1) mixxx/src/vinylcontrolproxy.cpp (+11/-1) mixxx/src/vinylcontrolproxy.h (+4/-2) mixxx/src/vinylcontrolxwax.cpp (+1/-1) mixxx/src/vinylcontrolxwax.h (+1/-1) |
||||||||
To merge this branch: | bzr merge lp://qastaging/~mixxxdevelopers/mixxx/features_external_mixer | ||||||||
Related bugs: |
|
||||||||
Related blueprints: |
External audio pass-through
(Medium)
Independent Player 1 & 2 Output Channels
(Undefined)
External Mixer Mode
(Essential)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
RJ Skerry-Ryan | Needs Resubmitting | ||
RAFFI TEA | Needs Fixing | ||
Albert Santoni | Needs Fixing | ||
William Good | Pending | ||
Review via email: mp+53747@code.qastaging.launchpad.net |
Description of the change
Based on Bills changes to SoundManager to allow registration of AudioDestination's for AudioInput's and my work on adding an EngineMicrophone EngineChannel, microphone support is now ready for review.
A microphone is a new EngineChannel. It has the group "[Microphone]".
A microphone channel has only 1 mic-specific control:
[Microphone], talkover
Setting talkover to 1 enables the mic input, 0 disables it.
It has controls that are identical to the deck controls for:
- VU meters
- Clipping
- Volume
To post a comment you must log in.
Just tried to test the branch on OS X, but segfault...
Debug: [Main]: Opened PortAudio stream successfully... starting coreaudio/ pa_mac_ core.c, line 1713.
Assertion failed: (sizeof( UInt32 ) == sizeof( long )), function ringBufferIOProc, file src/hostapi/