lp://staging/~mixxxdevelopers/mixxx/atomic-co
Created by
Daniel Schürmann
and last modified
- Get this branch:
- bzr branch lp://staging/~mixxxdevelopers/mixxx/atomic-co
Members of
Mixxx Development Team
can upload to this branch. Log in for directions.
Branch merges
Propose for merging
1 branch
proposed for merging into this one.
No branches
dependent on this one.
- Daniel Schürmann: Needs Fixing
- RJ Skerry-Ryan: Needs Fixing
-
Diff: 5303 lines (+2417/-1518)63 files modifiedmixxx/build/depends.py (+2/-3)
mixxx/res/controllers/Hercules DJ Console RMX 2.midi.xml (+963/-0)
mixxx/res/controllers/Hercules-DJ-Console-RMX-2-scripts.js (+128/-0)
mixxx/src/control/control.cpp (+132/-0)
mixxx/src/control/control.h (+95/-0)
mixxx/src/control/controlbehavior.cpp (+194/-0)
mixxx/src/control/controlbehavior.h (+97/-0)
mixxx/src/control/controlvalue.h (+157/-0)
mixxx/src/controlbeat.cpp (+0/-85)
mixxx/src/controlbeat.h (+0/-59)
mixxx/src/controllers/controller.h (+0/-2)
mixxx/src/controllers/controllerengine.cpp (+6/-11)
mixxx/src/controllers/controllermanager.cpp (+0/-4)
mixxx/src/controllers/controllermanager.h (+0/-1)
mixxx/src/controllers/midi/midicontroller.cpp (+5/-16)
mixxx/src/controllers/midi/midioutputhandler.cpp (+11/-20)
mixxx/src/controllers/midi/midioutputhandler.h (+2/-2)
mixxx/src/controllers/softtakeover.cpp (+1/-1)
mixxx/src/controllinpotmeter.cpp (+5/-24)
mixxx/src/controllinpotmeter.h (+1/-10)
mixxx/src/controllogpotmeter.cpp (+11/-87)
mixxx/src/controllogpotmeter.h (+3/-21)
mixxx/src/controlnull.cpp (+0/-27)
mixxx/src/controlnull.h (+0/-34)
mixxx/src/controlobject.cpp (+73/-317)
mixxx/src/controlobject.h (+49/-117)
mixxx/src/controlobjectthread.cpp (+40/-69)
mixxx/src/controlobjectthread.h (+33/-35)
mixxx/src/controlobjectthreadmain.cpp (+14/-14)
mixxx/src/controlobjectthreadmain.h (+9/-24)
mixxx/src/controlobjectthreadwidget.cpp (+33/-46)
mixxx/src/controlobjectthreadwidget.h (+7/-10)
mixxx/src/controlpotmeter.cpp (+68/-135)
mixxx/src/controlpotmeter.h (+10/-12)
mixxx/src/controlpushbutton.cpp (+22/-50)
mixxx/src/controlpushbutton.h (+1/-7)
mixxx/src/controlttrotary.cpp (+9/-27)
mixxx/src/controlttrotary.h (+2/-12)
mixxx/src/dlgprefeq.cpp (+4/-2)
mixxx/src/dlgprefeq.h (+1/-1)
mixxx/src/dlgtrackinfo.h (+9/-1)
mixxx/src/engine/bpmcontrol.cpp (+1/-1)
mixxx/src/engine/enginemaster.cpp (+0/-6)
mixxx/src/engine/enginemaster.h (+0/-1)
mixxx/src/engine/loopingcontrol.cpp (+41/-22)
mixxx/src/engine/ratecontrol.cpp (+10/-5)
mixxx/src/engine/syncworker.cpp (+0/-37)
mixxx/src/engine/syncworker.h (+0/-23)
mixxx/src/mixxx.cpp (+0/-7)
mixxx/src/mixxx.h (+0/-1)
mixxx/src/mixxxkeyboard.cpp (+2/-2)
mixxx/src/playermanager.cpp (+73/-44)
mixxx/src/playermanager.h (+17/-3)
mixxx/src/skin/legacyskinparser.cpp (+0/-10)
mixxx/src/skin/propertybinder.cpp (+1/-2)
mixxx/src/sounddeviceportaudio.cpp (+3/-2)
mixxx/src/soundmanager.cpp (+0/-6)
mixxx/src/soundmanager.h (+0/-2)
mixxx/src/vinylcontrol/vinylcontrolmanager.cpp (+10/-10)
mixxx/src/waveform/renderers/waveformmarkset.cpp (+2/-2)
mixxx/src/waveform/renderers/waveformrendererendoftrack.cpp (+1/-1)
mixxx/src/widget/wpushbutton.cpp (+2/-1)
mixxx/src/widget/wslidercomposed.cpp (+57/-44)
Related bugs
Related blueprints
Branch information
Recent revisions
- 3363. By Daniel Schürmann
-
merged from lp:~rryan/mixxx/atomic-co
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/~mixxxdevelopers/mixxx/trunk