summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2020-11-20 14:06:36 +0100
committerGitHub <noreply@github.com>2020-11-20 14:06:36 +0100
commit8c4309712ca16a6a104ba404cb81b28da9fe30f8 (patch)
tree35ae17d372cb77c25ecdf49acd7c3cd6bd246cc9
parent01a7129c6bae939a85f570de5ff9af2cec6fd2b0 (diff)
parentf99d07b0a96cdbcf8c309fc0d7dc13dd2fc0b197 (diff)
Merge branch '2.3' into clazy-returning-void-expression
-rw-r--r--.github/workflows/build.yml202
-rw-r--r--.github/workflows/clazy.yml2
-rw-r--r--CMakeLists.txt14
-rw-r--r--cmake/macos_build_environment_name1
-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--res/controllers/Denon-MC7000-scripts.js602
-rw-r--r--res/controllers/Denon-MC7000.midi.xml181
-rw-r--r--res/controllers/midi-components-0.0.js5
-rw-r--r--res/skins/LateNight/decks/row_5_transportLoopJump.xml6
-rw-r--r--res/skins/LateNight/decks/row_5_transportLoopJump_compact.xml6
-rw-r--r--res/skins/LateNight/mixer/vumeters_compact.xml7
-rw-r--r--res/skins/LateNight/style_classic.qss13
-rw-r--r--res/skins/LateNight/style_palemoon.qss26
-rw-r--r--res/skins/Tango (64 Samplers)/skin_preview.png (renamed from res/skins/Tango (64 Samplers)/skin_preview_Classic.png)bin118532 -> 118532 bytes
-rw-r--r--res/skins/Tango (64 Samplers)/skin_preview_ClubTwist.pngbin138212 -> 0 bytes
-rw-r--r--res/skins/Tango/skin.xml2
-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.cpp2
-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.cpp8
-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