summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2020-11-22 04:14:41 +0100
committerDaniel Schürmann <daschuer@mixxx.org>2020-11-22 04:14:41 +0100
commit4bde836ca36f8cf57ec2910d257352afc1b0b1ea (patch)
treecb281be63f8a557fadbeeb86f422c75b63c46bd6
parent337cc52cbc0344149021a467dc96217ce41ed087 (diff)
parent5311b4ed942cd136cd1b7e0319c0c041f69e66fc (diff)
Merge remote-tracking branch 'upstream/2.3' into main
-rw-r--r--.github/workflows/build.yml329
-rw-r--r--.github/workflows/clazy.yml2
-rw-r--r--.gitignore3
-rw-r--r--res/skins/Shade/knob_crossfader.pngbin1461 -> 2027 bytes
-rw-r--r--src/analyzer/analyzerbeats.cpp2
-rw-r--r--src/analyzer/analyzerbeats.h2
-rw-r--r--src/analyzer/analyzerkey.cpp4
-rw-r--r--src/analyzer/analyzerkey.h4
-rw-r--r--src/analyzer/analyzerwaveform.cpp2
-rw-r--r--src/analyzer/analyzerwaveform.h2
-rw-r--r--src/analyzer/plugins/buffering_utils.cpp4
-rw-r--r--src/analyzer/plugins/buffering_utils.h2
-rw-r--r--src/control/control.cpp2
-rw-r--r--src/control/control.h2
-rw-r--r--src/control/controlaudiotaperpot.cpp8
-rw-r--r--src/control/controlaudiotaperpot.h2
-rw-r--r--src/control/controleffectknob.cpp2
-rw-r--r--src/control/controleffectknob.h2
-rw-r--r--src/control/controlencoder.cpp2
-rw-r--r--src/control/controlencoder.h2
-rw-r--r--src/control/controlindicator.cpp2
-rw-r--r--src/control/controlindicator.h2
-rw-r--r--src/control/controllinpotmeter.cpp10
-rw-r--r--src/control/controllinpotmeter.h8
-rw-r--r--src/control/controllogpotmeter.cpp4
-rw-r--r--src/control/controllogpotmeter.h2
-rw-r--r--src/control/controlobject.cpp7
-rw-r--r--src/control/controlobject.h8
-rw-r--r--src/control/controlpotmeter.cpp14
-rw-r--r--src/control/controlpotmeter.h14
-rw-r--r--src/control/controlpushbutton.cpp2
-rw-r--r--src/control/controlpushbutton.h2
-rw-r--r--src/control/controlttrotary.cpp3
-rw-r--r--src/control/controlttrotary.h2
-rw-r--r--src/controllers/bulk/bulkcontroller.cpp2
-rw-r--r--src/controllers/bulk/bulkcontroller.h4
-rw-r--r--src/controllers/controller.cpp5
-rw-r--r--src/controllers/controller.h8
-rw-r--r--src/controllers/controllermanager.cpp4
-rw-r--r--src/controllers/controllermanager.h2
-rw-r--r--src/controllers/controllerpreset.h20
-rw-r--r--src/controllers/controllerpresetfilehandler.cpp6
-rw-r--r--src/controllers/controllerpresetfilehandler.h4
-rw-r--r--src/controllers/controlpickermenu.cpp129
-rw-r--r--src/controllers/controlpickermenu.h97
-rw-r--r--src/controllers/dlgcontrollerlearning.cpp6
-rw-r--r--src/controllers/dlgcontrollerlearning.h4
-rw-r--r--src/controllers/dlgprefcontroller.cpp2
-rw-r--r--src/controllers/dlgprefcontroller.h2
-rw-r--r--src/controllers/engine/colormapper.h2
-rw-r--r--src/controllers/engine/controllerengine.cpp44
-rw-r--r--src/controllers/engine/controllerengine.h41
-rw-r--r--src/controllers/midi/hss1394controller.cpp8
-rw-r--r--src/controllers/midi/hss1394controller.h3
-rw-r--r--src/controllers/midi/midicontroller.cpp2
-rw-r--r--src/controllers/midi/midicontroller.h4
-rw-r--r--src/controllers/midi/midicontrollerpreset.cpp6
-rw-r--r--src/controllers/midi/midicontrollerpreset.h6
-rw-r--r--src/controllers/midi/midimessage.h2
-rw-r--r--src/controllers/midi/portmidienumerator.cpp20
-rw-r--r--src/controllers/midi/portmidienumerator.h4
-rw-r--r--src/dialog/dlgabout.cpp3
-rw-r--r--src/dialog/dlgaboutdlg.ui34
-rw-r--r--src/dialog/dlgreplacecuecolor.h2
-rw-r--r--src/effects/builtin/echoeffect.h6
-rw-r--r--src/effects/effectinstantiator.h7
-rw-r--r--src/effects/lv2/lv2effectprocessor.cpp16
-rw-r--r--src/effects/lv2/lv2effectprocessor.h8
-rw-r--r--src/encoder/encoder.cpp7
-rw-r--r--src/encoder/encoder.h11
-rw-r--r--src/encoder/encoderflacsettings.cpp4
-rw-r--r--src/encoder/encoderflacsettings.h4
-rw-r--r--src/encoder/encodermp3.cpp2
-rw-r--r--src/encoder/encodermp3.h2
-rw-r--r--src/encoder/encodermp3settings.cpp6
-rw-r--r--src/encoder/encodermp3settings.h4
-rw-r--r--src/encoder/encoderopus.cpp2
-rw-r--r--src/encoder/encoderopus.h2
-rw-r--r--src/encoder/encoderopussettings.cpp4
-rw-r--r--src/encoder/encoderopussettings.h4
-rw-r--r--src/encoder/encoderrecordingsettings.h2
-rw-r--r--src/encoder/encodersettings.h16
-rw-r--r--src/encoder/encodervorbis.cpp2
-rw-r--r--src/encoder/encodervorbis.h2
-rw-r--r--src/encoder/encoderwave.cpp3
-rw-r--r--src/encoder/encoderwave.h2
-rw-r--r--src/encoder/encoderwavesettings.cpp4
-rw-r--r--src/encoder/encoderwavesettings.h4
-rw-r--r--src/engine/cachingreader/cachingreader.cpp2
-rw-r--r--src/engine/cachingreader/cachingreader.h6
-rw-r--r--src/engine/cachingreader/cachingreaderworker.cpp2
-rw-r--r--src/engine/cachingreader/cachingreaderworker.h4
-rw-r--r--src/engine/channels/engineaux.cpp8
-rw-r--r--src/engine/channels/engineaux.h9
-rw-r--r--src/engine/channels/enginedeck.cpp7
-rw-r--r--src/engine/channels/enginedeck.h9
-rw-r--r--src/engine/channels/enginemicrophone.cpp8
-rw-r--r--src/engine/channels/enginemicrophone.h9
-rw-r--r--src/engine/controls/bpmcontrol.cpp2
-rw-r--r--src/engine/controls/bpmcontrol.h2
-rw-r--r--src/engine/controls/clockcontrol.cpp2
-rw-r--r--src/engine/controls/clockcontrol.h4
-rw-r--r--src/engine/controls/cuecontrol.cpp8
-rw-r--r--src/engine/controls/cuecontrol.h10
-rw-r--r--src/engine/controls/enginecontrol.cpp4
-rw-r--r--src/engine/controls/enginecontrol.h4
-rw-r--r--src/engine/controls/keycontrol.cpp4
-rw-r--r--src/engine/controls/keycontrol.h2
-rw-r--r--src/engine/controls/loopingcontrol.cpp12
-rw-r--r--src/engine/controls/loopingcontrol.h8
-rw-r--r--src/engine/controls/quantizecontrol.cpp4
-rw-r--r--src/engine/controls/quantizecontrol.h2
-rw-r--r--src/engine/controls/ratecontrol.cpp14
-rw-r--r--src/engine/controls/ratecontrol.h282
-rw-r--r--src/engine/controls/vinylcontrolcontrol.cpp2
-rw-r--r--src/engine/controls/vinylcontrolcontrol.h2
-rw-r--r--src/engine/enginebuffer.cpp2
-rw-r--r--src/engine/enginebuffer.h4
-rw-r--r--src/engine/enginedelay.cpp2
-rw-r--r--src/engine/enginedelay.h2
-rw-r--r--src/engine/enginemaster.cpp12
-rw-r--r--src/engine/enginemaster.h12
-rw-r--r--src/engine/enginepregain.cpp2
-rw-r--r--src/engine/enginepregain.h2
-rw-r--r--src/engine/enginevumeter.cpp2
-rw-r--r--src/engine/enginevumeter.h2
-rw-r--r--src/engine/positionscratchcontroller.cpp22
-rw-r--r--src/engine/positionscratchcontroller.h2
-rw-r--r--src/engine/sidechain/enginesidechain.cpp6
-rw-r--r--src/engine/sidechain/enginesidechain.h6
-rw-r--r--src/engine/sidechain/shoutconnection.cpp4
-rw-r--r--src/engine/sidechain/shoutconnection.h6
-rw-r--r--src/errordialoghandler.cpp6
-rw-r--r--src/errordialoghandler.h7
-rw-r--r--src/library/analysisfeature.cpp8
-rw-r--r--src/library/analysisfeature.h6
-rw-r--r--src/library/autodj/autodjfeature.cpp6
-rw-r--r--src/library/autodj/autodjfeature.h6
-rw-r--r--src/library/autodj/autodjprocessor.h5
-rw-r--r--src/library/autodj/dlgautodj.cpp4
-rw-r--r--