lp:~ywwg/mixxx/atomic-master-sync
Created by
Owen Williams
and last modified
- Get this branch:
- bzr branch lp:~ywwg/mixxx/atomic-master-sync
Only
Owen Williams
can upload to this branch. If you are
Owen Williams
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
Ready for review
for merging
into
lp:~mixxxdevelopers/mixxx/trunk
- RJ Skerry-Ryan: Pending requested
-
Diff: 46744 lines (+38588/-2518)82 files modifiedmixxx/build/depends.py (+3/-3)
mixxx/res/controllers/Hercules-DJ-Control-MP3-scripts.js (+253/-682)
mixxx/res/controllers/Xone-K2-scripts.js.sync (+154/-0)
mixxx/res/skins/LateNight1280x800-WXGA/skin.xml (+118/-90)
mixxx/res/skins/LateNight1366x768-WXGA/skin.xml (+97/-58)
mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/CHANGELOG.txt (+216/-0)
mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/channel.xml (+166/-0)
mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/deck.xml (+1180/-0)
mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/playback.xml (+586/-0)
mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/skin.orig.xml (+6511/-0)
mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/skin.resized.xml (+6511/-0)
mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/skin.xml (+6808/-0)
mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/skin.xml.orig (+6852/-0)
mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/skin.xml~ (+6808/-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 (+64/-307)
mixxx/src/controlobject.h (+48/-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/controlvaluedelegate.cpp (+4/-0)
mixxx/src/dlgprefeq.cpp (+4/-2)
mixxx/src/dlgprefeq.h (+1/-1)
mixxx/src/dlgprefvinyl.cpp (+75/-2)
mixxx/src/dlgprefvinyl.h (+4/-0)
mixxx/src/dlgprefvinyldlg.ui (+123/-4)
mixxx/src/dlgtrackinfo.h (+9/-1)
mixxx/src/engine/bpmcontrol.cpp (+276/-75)
mixxx/src/engine/bpmcontrol.h (+35/-5)
mixxx/src/engine/enginebuffer.cpp (+42/-15)
mixxx/src/engine/enginebuffer.h (+2/-0)
mixxx/src/engine/enginechannel.cpp (+27/-0)
mixxx/src/engine/enginechannel.h (+8/-0)
mixxx/src/engine/enginemaster.cpp (+69/-6)
mixxx/src/engine/enginemaster.h (+5/-1)
mixxx/src/engine/enginesync.cpp (+420/-0)
mixxx/src/engine/enginesync.h (+84/-0)
mixxx/src/engine/loopingcontrol.cpp (+42/-23)
mixxx/src/engine/loopingcontrol.h (+42/-39)
mixxx/src/engine/ratecontrol.cpp (+207/-19)
mixxx/src/engine/ratecontrol.h (+40/-4)
mixxx/src/engine/syncworker.cpp (+0/-37)
mixxx/src/engine/syncworker.h (+0/-23)
mixxx/src/mixxx.cpp (+120/-16)
mixxx/src/mixxx.h (+6/-1)
mixxx/src/mixxxkeyboard.cpp (+2/-2)
mixxx/src/playermanager.cpp (+146/-52)
mixxx/src/playermanager.h (+21/-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 (+40/-15)
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)
Branch information
Recent revisions
- 3372. By RJ Skerry-Ryan
-
Fix vamp-plugins SConscript to add the INTERNAL_VAMP_PATH to the include path correctly.
- 3370. By RJ Skerry-Ryan
-
Don't waste time formatting debug strings in MidiController:
:receive( ) unless debugging is on. - 3369. By Owen Williams
-
If quantize is on, don't possibly choose the next beat because that will cause a seek (bzr native commit)
- 3364. By RJ Skerry-Ryan
-
Minor nits from the vinyl-passthrough merge. Avoid values() calls on QHash and duplicate contains/lookups on QHashes in SoundManager. Move AudioInput connections into PlayerManager, do it for every VINYLCONTROL AudioInput. If we don't get any beyond 2 it shouldn't matter, they just wont get connected/
disconnected/ received.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)