Merge lp://qastaging/~mattmik/mixxx/mic_modifications into lp://qastaging/~mixxxdevelopers/mixxx/trunk
Proposed by
Matthew Mikolay
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~mattmik/mixxx/mic_modifications |
Merge into: | lp://qastaging/~mixxxdevelopers/mixxx/trunk |
Diff against target: |
936 lines (+488/-77) 18 files modified
mixxx/build/depends.py (+2/-0) mixxx/src/basetrackplayer.cpp (+7/-3) mixxx/src/basetrackplayer.h (+5/-0) mixxx/src/engine/enginechannel.cpp (+9/-0) mixxx/src/engine/enginechannel.h (+10/-1) mixxx/src/engine/engineclipping.cpp (+20/-33) mixxx/src/engine/engineclipping.h (+11/-25) mixxx/src/engine/enginecompressor.cpp (+148/-0) mixxx/src/engine/enginecompressor.h (+61/-0) mixxx/src/engine/enginedeck.cpp (+10/-5) mixxx/src/engine/enginedeck.h (+4/-2) mixxx/src/engine/enginemaster.cpp (+58/-0) mixxx/src/engine/enginemaster.h (+10/-0) mixxx/src/engine/enginepeaking.cpp (+65/-0) mixxx/src/engine/enginepeaking.h (+40/-0) mixxx/src/mixxx.cpp (+5/-2) mixxx/src/soundmanager.cpp (+18/-1) mixxx/src/soundmanager.h (+5/-5) |
To merge this branch: | bzr merge lp://qastaging/~mattmik/mixxx/mic_modifications |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mixxx Development Team | Pending | ||
Review via email:
|
Description of the change
Includes EngineCompressor, a dynamic compressor engine. EngineCompressor is applied to master out as well as any selected deck outputs.
To post a comment you must log in.
Unmerged revisions
- 3275. By Matthew Mikolay
-
Merging from lp:mixxx
- 3274. By Matthew Mikolay
-
Merging from lp:mixxx/1.11
- 3273. By Matthew Mikolay
-
Set default values for compressor
- 3272. By Matthew Mikolay
-
Temporary fix for extending peak detection in EnginePeaking
- 3271. By Matthew Mikolay
-
Merging from lp:mixxx/1.11
- 3270. By Matthew Mikolay
-
Merging from lp:mixxx/1.11
- 3269. By Matthew Mikolay
-
Changed names of methods to add compressors/
clippers in EngineMaster - 3268. By Matthew Mikolay
-
Compressor activation design changed: QHashes stored in EngineMaster, modified in SoundManager
- 3267. By Matthew Mikolay
-
Merge from lp:mixxx/1.11
- 3266. By Matthew Mikolay
-
Transfers ownership of channel compressors/
clippers to EngineMaster