summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-12-07 23:23:29 +0100
committerJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-12-07 23:23:29 +0100
commit5ed122e334449fda0071c4572ce445ed9f2ede4e (patch)
treed68413698a282c1684c280cf670e09167109ed50
parent6bac62651147ff2a902347522a629aea13d81f17 (diff)
parente0f70a2cc1d10b65f5b7cf5bd832121510e66a11 (diff)
Merge branch '2.3' of github.com:mixxxdj/mixxx into cleanup-headers
-rw-r--r--.travis.yml250
-rw-r--r--CMakeLists.txt6
-rw-r--r--src/analyzer/analyzerthread.cpp1
-rw-r--r--src/analyzer/trackanalysisscheduler.cpp3
-rw-r--r--src/broadcast/broadcastmanager.cpp4
-rw-r--r--src/control/control.cpp1
-rw-r--r--src/control/controlaudiotaperpot.cpp2
-rw-r--r--src/control/controleffectknob.cpp3
-rw-r--r--src/control/controlencoder.cpp2
-rw-r--r--src/control/controlindicator.cpp2
-rw-r--r--src/control/controllinpotmeter.cpp2
-rw-r--r--src/control/controllogpotmeter.cpp2
-rw-r--r--src/control/controlmodel.cpp2
-rw-r--r--src/control/controlobject.cpp8
-rw-r--r--src/control/controlobjectscript.cpp4
-rw-r--r--src/control/controlpotmeter.cpp4
-rw-r--r--src/control/controlproxy.cpp4
-rw-r--r--src/control/controlpushbutton.cpp2
-rw-r--r--src/control/controlttrotary.cpp2
-rw-r--r--src/controllers/bulk/bulkcontroller.cpp8
-rw-r--r--src/controllers/colormapperjsproxy.cpp4
-rw-r--r--src/controllers/controller.cpp4
-rw-r--r--src/controllers/controllerengine.cpp8
-rw-r--r--src/controllers/controllerenumerator.cpp2
-rw-r--r--src/controllers/controllerinputmappingtablemodel.cpp8
-rw-r--r--src/controllers/controllerlearningeventfilter.cpp10
-rw-r--r--src/controllers/controllermanager.cpp11
-rw-r--r--src/controllers/controllermappingtablemodel.cpp2
-rw-r--r--src/controllers/controlleroutputmappingtablemodel.cpp7
-rw-r--r--src/controllers/controlpickermenu.cpp1
-rw-r--r--src/controllers/delegates/controldelegate.cpp6
-rw-r--r--src/controllers/delegates/midioptionsdelegate.cpp6
-rw-r--r--src/controllers/dlgcontrollerlearning.cpp4
-rw-r--r--src/controllers/dlgprefcontroller.cpp1
-rw-r--r--src/controllers/dlgprefcontrollers.cpp1
-rw-r--r--src/controllers/hid/hidcontroller.cpp1
-rw-r--r--src/controllers/keyboard/keyboardeventfilter.cpp8
-rw-r--r--src/controllers/midi/hss1394controller.cpp4
-rw-r--r--src/controllers/midi/hss1394enumerator.cpp4
-rw-r--r--src/controllers/midi/midicontroller.cpp7
-rw-r--r--src/controllers/midi/midienumerator.cpp2
-rw-r--r--src/controllers/midi/midioutputhandler.cpp8
-rw-r--r--src/controllers/midi/portmidicontroller.cpp4
-rw-r--r--src/controllers/midi/portmidienumerator.cpp6
-rw-r--r--src/database/mixxxdb.cpp3
-rw-r--r--src/dialog/dlgabout.cpp5
-rw-r--r--src/dialog/dlgdevelopertools.cpp3
-rw-r--r--src/dialog/dlgreplacecuecolor.cpp1
-rw-r--r--src/effects/builtin/builtinbackend.cpp18
-rw-r--r--src/effects/effect.cpp6
-rw-r--r--src/effects/effectbuttonparameterslot.cpp6
-rw-r--r--src/effects/effectchain.cpp5
-rw-r--r--src/effects/effectchainmanager.cpp10
-rw-r--r--src/effects/effectchainslot.cpp9
-rw-r--r--src/effects/effectparameter.cpp6
-rw-r--r--src/effects/effectparameterslot.cpp6
-rw-r--r--src/effects/effectparameterslotbase.cpp4
-rw-r--r--src/effects/effectrack.cpp4
-rw-r--r--src/effects/effectsbackend.cpp4
-rw-r--r--src/effects/effectslot.cpp5
-rw-r--r--src/effects/effectsmanager.cpp6
-rw-r--r--src/effects/lv2/lv2backend.cpp2
-rw-r--r--src/engine/bufferscalers/enginebufferscale.cpp1
-rw-r--r--src/engine/bufferscalers/enginebufferscalerubberband.cpp1
-rw-r--r--src/engine/bufferscalers/enginebufferscalest.cpp2
-rw-r--r--src/engine/cachingreader/cachingreader.cpp11
-rw-r--r--src/engine/cachingreader/cachingreaderworker.cpp1
-rw-r--r--src/engine/channels/engineaux.cpp3
-rw-r--r--src/engine/channels/enginechannel.cpp1
-rw-r--r--src/engine/channels/enginedeck.cpp1
-rw-r--r--src/engine/channels/enginemicrophone.cpp3
-rw-r--r--src/engine/controls/bpmcontrol.cpp1
-rw-r--r--src/engine/controls/clockcontrol.cpp1
-rw-r--r--src/engine/controls/cuecontrol.cpp1
-rw-r--r--src/engine/controls/enginecontrol.cpp4
-rw-r--r--src/engine/controls/keycontrol.cpp1
-rw-r--r--src/engine/controls/loopingcontrol.cpp6
-rw-r--r--src/engine/controls/quantizecontrol.cpp1
-rw-r--r--src/engine/controls/ratecontrol.cpp19
-rw-r--r--src/engine/controls/vinylcontrolcontrol.cpp1
-rw-r--r--src/engine/enginebuffer.cpp1
-rw-r--r--src/engine/enginedelay.cpp3
-rw-r--r--src/engine/enginemaster.cpp11
-rw-r--r--src/engine/engineobject.cpp2
-rw-r--r--src/engine/enginetalkoverducking.cpp4
-rw-r--r--src/engine/enginetalkoverducking.h2
-rw-r--r--src/engine/enginevumeter.cpp3
-rw-r--r--src/engine/engineworker.cpp2
-rw-r--r--src/engine/engineworkerscheduler.cpp4
-rw-r--r--src/engine/filters/enginefilter.cpp2
-rw-r--r--src/engine/filters/enginefilterbessel4.cpp2
-rw-r--r--src/engine/filters/enginefilterbessel8.cpp2
-rw-r--r--src/engine/filters/enginefilterbiquad1.cpp5
-rw-r--r--src/engine/filters/enginefilterbutterworth4.cpp2
-rw-r--r--src/engine/filters/enginefilterbutterworth8.cpp2
-rw-r--r--src/engine/filters/enginefilterlinkwitzriley2.cpp2
-rw-r--r--src/engine/filters/enginefilterlinkwitzriley4.cpp2
-rw-r--r--src/engine/filters/enginefilterlinkwitzriley8.cpp2
-rw-r--r--src/engine/filters/enginefiltermoogladder4.cpp1
-rw-r--r--src/engine/sidechain/enginerecord.cpp1
-rw-r--r--src/engine/sidechain/enginesidechain.cpp5
-rw-r--r--src/engine/sidechain/shoutconnection.cpp4
-rw-r--r--src/engine/sync/internalclock.cpp1
-rw-r--r--src/engine/sync/synccontrol.cpp1
-rw-r--r--src/errordialoghandler.cpp4
-rw-r--r--src/library/analysisfeature.cpp14
-rw-r--r--src/library/analysislibrarytablemodel.cpp2
-rw-r--r--src/library/autodj/autodjfeature.cpp1
-rw-r--r--src/library/autodj/autodjprocessor.cpp1
-rw-r--r--src/library/autodj/dlgautodj.cpp1
-rw-r--r--src/library/banshee/bansheefeature.cpp1
-rw-r--r--src/library/banshee/bansheeplaylistmodel.cpp1
-rw-r--r--src/library/baseexternallibraryfeature.cpp3
-rw-r--r--src/library/baseexternalplaylistmodel.cpp1
-rw-r--r--src/library/baseexternaltrackmodel.cpp1
-rw-r--r--src/library/baseplaylistfeature.cpp1
-rw-r--r--src/library/basesqltablemodel.cpp1
-rw-r--r--src/library/basetrackcache.cpp1
-rw-r--r--src/library/basetracksetfeature.cpp2
-rw-r--r--src/library/basetracktablemodel.cpp372
-rw-r--r--src/library/basetracktablemodel.h52
-rw-r--r--src/library/bpmdelegate.cpp12
-rw-r--r--src/library/browse/browsefeature.cpp6
-rw-r--r--src/library/browse/browsetablemodel.cpp1
-rw-r--r--src/library/browse/browsethread.cpp3
-rw-r--r--src/library/browse/foldertreemodel.cpp5
-rw-r--r--src/library/colordelegate.cpp1
-rw-r--r--src/library/columncache.cpp6
-rw-r--r--src/library/coverartcache.cpp1
-rw-r--r--src/library/coverartdelegate.cpp1
-rw-r--r--src/library/crate/cratefeature.cpp1
-rw-r--r--src/library/crate/cratefeaturehelper.cpp2
-rw-r--r--src/library/crate/cratetablemodel.cpp1
-rw-r--r--src/library/dao/autodjcratesdao.cpp2
-rw-r--r--src/library/dao/playlistdao.cpp2
-rw-r--r--src/library/dao/trackdao.cpp1
-rw-r--r--src/library/dlganalysis.cpp14
-rw-r--r--src/library/dlgcoverartfullsize.cpp1
-r