summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian <git-developer@users.noreply.github.com>2020-11-26 20:44:11 +0100
committerChristian <git-developer@users.noreply.github.com>2020-11-26 20:44:11 +0100
commitf014e8b8fff958872422f9ca9eedd86a9b642939 (patch)
treefb9c09ff9dacd244922f1ce9181940e152ea2c30
parent076ea391555046a8b6f3e7e49d27b34bdd765863 (diff)
parentb8ff1ba3f2f1430f22e333f6d9a9936c5f7411c6 (diff)
Merge remote-tracking branch 'upstream/2.3' into feature/controller-mapping-behringer-bcr2000
-rw-r--r--.github/workflows/build.yml262
-rw-r--r--.github/workflows/clazy.yml5
-rw-r--r--.gitignore3
-rw-r--r--.travis.yml9
-rw-r--r--CMakeLists.txt62
-rw-r--r--appveyor.yml331
-rw-r--r--build/osx/entitlements.plist2
-rwxr-xr-xbuild/travis/deploy.sh30
-rw-r--r--cmake/macos_build_environment2
-rw-r--r--cmake/macos_bundle.plist.in2
-rw-r--r--cmake/modules/FindTagLib.cmake87
-rw-r--r--cmake/modules/FindTaglib.cmake133
-rw-r--r--cmake/run-mixxx.sh.in2
-rw-r--r--cmake/windows_build_environment_name (renamed from build/windows/golden_environment)0
-rw-r--r--res/controllers/midi-components-0.0.js5
-rw-r--r--res/skins/Deere/style.qss54
-rw-r--r--res/skins/LateNight/library.xml2
-rw-r--r--res/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_blue.svg (renamed from res/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_orange.svg)0
-rw-r--r--res/skins/LateNight/palemoon/buttons/btn__lib_bpm_unlocked_black.svg5
-rw-r--r--res/skins/LateNight/style_classic.qss113
-rw-r--r--res/skins/LateNight/style_palemoon.qss102
-rw-r--r--res/skins/Shade/knob_crossfader.pngbin1461 -> 2027 bytes
-rw-r--r--res/skins/Shade/library.xml59
-rw-r--r--res/skins/Shade/skin.xml70
-rw-r--r--res/skins/Shade/style.qss54
-rw-r--r--res/skins/Shade/style_dark.qss28
-rw-r--r--res/skins/Tango/style.qss92
-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/colormapper.h2
-rw-r--r--src/controllers/colormapperjsproxy.cpp3
-rw-r--r--src/controllers/colormapperjsproxy.h2
-rw-r--r--src/controllers/controller.cpp5
-rw-r--r--src/controllers/controller.h10
-rw-r--r--src/controllers/controllerengine.cpp61
-rw-r--r--src/controllers/controllerengine.h73
-rw-r--r--src/controllers/controllerlearningeventfilter.cpp8
-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/delegates/controldelegate.cpp2
-rw-r--r--src/controllers/delegates/midibytedelegate.cpp4
-rw-r--r--src/controllers/delegates/midichanneldelegate.cpp4
-rw-r--r--src/controllers/delegates/midiopcodedelegate.cpp4
-rw-r--r--src/controllers/delegates/midioptionsdelegate.cpp2
-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/hid/hidcontroller.cpp40
-rw-r--r--src/controllers/hid/hidcontroller.h2
-rw-r--r--src/controllers/midi/hss1394controller.cpp10
-rw-r--r--src/controllers/midi/hss1394controller.h5
-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/portmidicontroller.cpp2
-rw-r--r--src/controllers/midi/portmidicontroller.h2
-rw-r--r--src/controllers/midi/portmidienumerator.cpp20
-rw-r--r--src/controllers/midi/portmidienumerator.h4
-rw-r--r--src/controllers/softtakeover.cpp2
-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.cpp17
-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--