summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-12-15 17:45:30 +0100
committerJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-12-15 17:45:30 +0100
commit95a5716a54b6bc0f937ea08755bdfc4cd01ee351 (patch)
treef575fd31ae7f9482df0c46880109da554a3b732e /src
parent3f7b674633fdb7b314ef4ecefd6223928872b92f (diff)
parent72b91833a8e7049e75328d32b00c596c4516022a (diff)
Merge branch '2.3' of github.com:mixxxdj/mixxx into main
Diffstat (limited to 'src')
-rw-r--r--src/analyzer/analyzergain.cpp4
-rw-r--r--src/analyzer/analyzerwaveform.cpp8
-rw-r--r--src/broadcast/broadcastmanager.cpp11
-rw-r--r--src/control/control.cpp4
-rw-r--r--src/control/controlbehavior.cpp14
-rw-r--r--src/control/controleffectknob.cpp2
-rw-r--r--src/control/controlobject.cpp4
-rw-r--r--src/controllers/bulk/bulkcontroller.cpp22
-rw-r--r--src/controllers/bulk/bulkenumerator.cpp2
-rw-r--r--src/controllers/controller.cpp18
-rw-r--r--src/controllers/controllerinputmappingtablemodel.cpp24
-rw-r--r--src/controllers/controllermappingtablemodel.cpp4
-rw-r--r--src/controllers/controlleroutputmappingtablemodel.cpp20
-rw-r--r--src/controllers/controllerpresetfilehandler.cpp3
-rw-r--r--src/controllers/controllerpresetinfo.cpp16
-rw-r--r--src/controllers/controllerpresetinfoenumerator.cpp2
-rw-r--r--src/controllers/controlpickermenu.cpp2
-rw-r--r--src/controllers/delegates/controldelegate.cpp6
-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.cpp4
-rw-r--r--src/controllers/dlgcontrollerlearning.cpp8
-rw-r--r--src/controllers/dlgprefcontroller.cpp33
-rw-r--r--src/controllers/hid/hidenumerator.cpp18
-rw-r--r--src/controllers/keyboard/keyboardeventfilter.cpp17
-rw-r--r--src/controllers/midi/midicontroller.cpp22
-rw-r--r--src/controllers/midi/midicontrollerpresetfilehandler.cpp90
-rw-r--r--src/controllers/midi/portmidicontroller.cpp5
-rw-r--r--src/controllers/midi/portmidienumerator.cpp4
-rw-r--r--src/controllers/softtakeover.cpp10
-rw-r--r--src/coreservices.cpp9
-rw-r--r--src/database/mixxxdb.cpp6
-rw-r--r--src/database/schemamanager.cpp2
-rw-r--r--src/effects/builtin/flangereffect.cpp2
-rw-r--r--src/effects/builtin/parametriceqeffect.cpp8
-rw-r--r--src/effects/builtin/tremoloeffect.cpp2
-rw-r--r--src/effects/effect.cpp12
-rw-r--r--src/effects/effectbuttonparameterslot.cpp2
-rw-r--r--src/effects/effectchain.cpp2
-rw-r--r--src/effects/effectchainmanager.cpp6
-rw-r--r--src/effects/effectchainslot.cpp5
-rw-r--r--src/effects/effectparameterslot.cpp8
-rw-r--r--src/effects/effectparameterslotbase.cpp11
-rw-r--r--src/effects/effectrack.cpp2
-rw-r--r--src/effects/effectsmanager.cpp4
-rw-r--r--src/effects/lv2/lv2effectprocessor.cpp4
-rw-r--r--src/effects/lv2/lv2manifest.cpp2
-rw-r--r--src/encoder/encodermp3.cpp9
-rw-r--r--src/encoder/encoderopus.cpp5
-rw-r--r--src/encoder/encoderopussettings.cpp2
-rw-r--r--src/encoder/encodervorbis.cpp16
-rw-r--r--src/encoder/encoderwave.cpp4
-rw-r--r--src/engine/cachingreader/cachingreader.cpp8
-rw-r--r--src/engine/cachingreader/cachingreaderchunk.cpp4
-rw-r--r--src/engine/channels/engineaux.cpp6
-rw-r--r--src/engine/channels/enginedeck.cpp8
-rw-r--r--src/engine/channels/enginemicrophone.cpp6
-rw-r--r--src/engine/controls/bpmcontrol.cpp47
-rw-r--r--src/engine/controls/cuecontrol.cpp4
-rw-r--r--src/engine/controls/loopingcontrol.cpp13
-rw-r--r--src/engine/controls/ratecontrol.cpp7
-rw-r--r--src/engine/effects/engineeffect.cpp2
-rw-r--r--src/engine/effects/engineeffectsmanager.cpp2
-rw-r--r--src/engine/enginemaster.cpp13
-rw-r--r--src/engine/enginepregain.cpp14
-rw-r--r--src/engine/enginetalkoverducking.cpp2
-rw-r--r--src/engine/enginevumeter.cpp20
-rw-r--r--src/engine/enginexfader.cpp2
-rw-r--r--src/engine/filters/enginefilter.cpp14
-rw-r--r--src/engine/readaheadmanager.cpp14
-rw-r--r--src/engine/sidechain/enginenetworkstream.cpp2
-rw-r--r--src/engine/sidechain/networkoutputstreamworker.cpp2
-rw-r--r--src/engine/sidechain/shoutconnection.cpp24
-rw-r--r--src/engine/sync/basesyncablelistener.cpp8
-rw-r--r--src/errordialoghandler.cpp8
-rw-r--r--src/library/autodj/autodjfeature.cpp2
-rw-r--r--src/library/autodj/autodjprocessor.cpp6
-rw-r--r--src/library/autodj/dlgautodj.cpp8
-rw-r--r--src/library/banshee/bansheefeature.cpp8
-rw-r--r--src/library/banshee/bansheeplaylistmodel.cpp2
-rw-r--r--src/library/baseexternallibraryfeature.cpp9
-rw-r--r--src/library/basetrackcache.cpp7
-rw-r--r--src/library/bpmdelegate.cpp4
-rw-r--r--src/library/browse/browsefeature.cpp2
-rw-r--r--src/library/browse/browsetablemodel.cpp2
-rw-r--r--src/library/browse/browsethread.cpp4
-rw-r--r--src/library/browse/foldertreemodel.cpp12
-rw-r--r--src/library/columncache.cpp4
-rw-r--r--src/library/coverartutils.cpp2
-rw-r--r--src/library/dao/analysisdao.cpp2
-rw-r--r--src/library/dao/autodjcratesdao.cpp5
-rw-r--r--src/library/dao/playlistdao.cpp6
-rw-r--r--src/library/dao/trackdao.cpp10
-rw-r--r--src/library/dlgtagfetcher.cpp3
-rw-r--r--src/library/dlgtrackinfo.cpp6
-rw-r--r--src/library/export/trackexportdlg.cpp8
-rw-r--r--src/library/export/trackexportwizard.cpp2
-rw-r--r--src/library/itunes/itunesfeature.cpp32
-rw-r--r--src/library/library.cpp8
-rw-r--r--src/library/librarycontrol.cpp18
-rw-r--r--src/library/libraryfeature.cpp18
-rw-r--r--src/library/parsercsv.cpp16
-rw-r--r--src/library/parserm3u.cpp15
-rw-r--r--src/library/parserpls.cpp13
-rw-r--r--src/library/proxytrackmodel.cpp14
-rw-r--r--src/library/rekordbox/rekordbox_pdb.cpp117
-rw-r--r--src/library/rekordbox/rekordboxfeature.cpp5
-rw-r--r--src/library/rhythmbox/rhythmboxfeature.cpp18
-rw-r--r--src/library/serato/seratofeature.cpp3
-rw-r--r--src/library/sidebarmodel.cpp8
-rw-r--r--src/library/stareditor.cpp7
-rw-r--r--src/library/trackset/baseplaylistfeature.cpp32
-rw-r--r--src/library/trackset/crate/cratefeature.cpp5
-rw-r--r--src/library/traktor/traktorfeature.cpp27
-rw-r--r--src/mixer/basetrackplayer.cpp6
-rw-r--r--src/mixer/playerinfo.cpp2
-rw-r--r--src/mixer/playermanager.cpp14
-rw-r--r--src/mixxx.cpp31
-rw-r--r--src/musicbrainz/chromaprinter.cpp4
-rw-r--r--src/preferences/broadcastprofile.cpp6
-rw-r--r--src/preferences/broadcastsettings.cpp18
-rw-r--r--src/preferences/broadcastsettings_legacy.cpp5
-rw-r--r--src/preferences/broadcastsettingsmodel.cpp23
-rw-r--r--src/preferences/colorpaletteeditor.cpp2
-rw-r--r--src/preferences/dialog/dlgprefbroadcast.cpp5
-rw-r--r--src/preferences/dialog/dlgprefcrossfader.cpp4
-rw-r--r--src/preferences/dialog/dlgprefdeck.cpp2
-rw-r--r--src/preferences/dialog/dlgprefeffects.cpp2
-rw-r--r--src/preferences/dialog/dlgprefeq.cpp6
-rw-r--r--src/preferences/dialog/dlgpreferences.cpp9
-rw-r--r--src/preferences/dialog/dlgprefinterface.cpp2