summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-10-09 14:42:41 +0200
committerJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-10-09 14:42:41 +0200
commitc792c7ce76fb10f6e733f0cc41cf43878b425e47 (patch)
tree006674c42c0a9db00b6a386cd999cb04570b6ca4 /src
parent817c2f1f7417b859b0508c8f965f8cab274ca51a (diff)
parentbee15eeed753e63810cf8497e9631cce2d7e3416 (diff)
Merge branch '2.3' of github.com:mixxxdj/mixxx into float-warnings-pt-3
Diffstat (limited to 'src')
-rw-r--r--src/analyzer/analyzer.h2
-rw-r--r--src/analyzer/analyzerbeats.cpp6
-rw-r--r--src/analyzer/analyzerbeats.h1
-rw-r--r--src/analyzer/analyzerkey.cpp1
-rw-r--r--src/analyzer/analyzerkey.h2
-rw-r--r--src/analyzer/analyzersilence.cpp1
-rw-r--r--src/analyzer/analyzerthread.cpp14
-rw-r--r--src/analyzer/analyzerthread.h6
-rw-r--r--src/analyzer/plugins/analyzerkeyfinder.cpp3
-rw-r--r--src/analyzer/plugins/analyzerkeyfinder.h1
-rw-r--r--src/analyzer/plugins/analyzerqueenmarybeats.cpp2
-rw-r--r--src/control/controllinpotmeter.cpp4
-rw-r--r--src/controllers/controllermanager.cpp10
-rw-r--r--src/controllers/controllermanager.h2
-rw-r--r--src/controllers/hid/hidcontroller.cpp49
-rw-r--r--src/controllers/hid/hidcontroller.h5
-rw-r--r--src/dialog/dlgreplacecuecolor.cpp1
-rw-r--r--src/effects/builtin/balanceeffect.cpp4
-rw-r--r--src/effects/builtin/bitcrushereffect.cpp10
-rw-r--r--src/effects/builtin/echoeffect.cpp15
-rw-r--r--src/effects/builtin/flangereffect.cpp20
-rw-r--r--src/effects/builtin/graphiceqeffect.cpp6
-rw-r--r--src/effects/builtin/linkwitzriley8eqeffect.cpp25
-rw-r--r--src/effects/builtin/loudnesscontoureffect.cpp7
-rw-r--r--src/effects/builtin/loudnesscontoureffect.h2
-rw-r--r--src/effects/builtin/lvmixeqbase.h25
-rw-r--r--src/effects/builtin/moogladder4filtereffect.cpp12
-rw-r--r--src/effects/builtin/parametriceqeffect.cpp6
-rw-r--r--src/encoder/encoderffmpegcore.h7
-rw-r--r--src/encoder/encodersndfileflac.h1
-rw-r--r--src/encoder/encodervorbis.h6
-rw-r--r--src/encoder/encoderwave.h4
-rw-r--r--src/engine/cachingreader/cachingreader.h2
-rw-r--r--src/engine/cachingreader/cachingreaderworker.cpp1
-rw-r--r--src/engine/cachingreader/cachingreaderworker.h7
-rw-r--r--src/engine/controls/bpmcontrol.cpp1
-rw-r--r--src/engine/controls/bpmcontrol.h3
-rw-r--r--src/engine/controls/clockcontrol.cpp5
-rw-r--r--src/engine/controls/clockcontrol.h5
-rw-r--r--src/engine/controls/cuecontrol.cpp3
-rw-r--r--src/engine/controls/cuecontrol.h3
-rw-r--r--src/engine/controls/enginecontrol.h3
-rw-r--r--src/engine/controls/keycontrol.cpp1
-rw-r--r--src/engine/controls/keycontrol.h1
-rw-r--r--src/engine/controls/loopingcontrol.cpp4
-rw-r--r--src/engine/controls/loopingcontrol.h2
-rw-r--r--src/engine/controls/quantizecontrol.cpp6
-rw-r--r--src/engine/controls/quantizecontrol.h5
-rw-r--r--src/engine/controls/ratecontrol.cpp2
-rw-r--r--src/engine/controls/vinylcontrolcontrol.cpp8
-rw-r--r--src/engine/controls/vinylcontrolcontrol.h6
-rw-r--r--src/engine/enginebuffer.h11
-rw-r--r--src/engine/enginesidechaincompressor.cpp4
-rw-r--r--src/engine/filters/enginefilterdelay.h2
-rw-r--r--src/engine/filters/enginefiltermoogladder4.h17
-rw-r--r--src/engine/filters/enginefilterpansingle.h6
-rw-r--r--src/engine/positionscratchcontroller.cpp2
-rw-r--r--src/engine/sidechain/enginerecord.cpp4
-rw-r--r--src/engine/sidechain/enginerecord.h6
-rw-r--r--src/engine/sidechain/shoutconnection.h11
-rw-r--r--src/engine/sync/synccontrol.cpp1
-rw-r--r--src/library/autodj/autodjprocessor.h6
-rw-r--r--src/library/autodj/dlgautodj.cpp2
-rw-r--r--src/library/autodj/dlgautodj.h12
-rw-r--r--src/library/basecoverartdelegate.cpp6
-rw-r--r--src/library/basecoverartdelegate.h3
-rw-r--r--src/library/baseplaylistfeature.h2
-rw-r--r--src/library/basesqltablemodel.cpp11
-rw-r--r--src/library/basesqltablemodel.h4
-rw-r--r--src/library/basetrackcache.cpp9
-rw-r--r--src/library/basetrackcache.h8
-rw-r--r--src/library/basetracktablemodel.cpp5
-rw-r--r--src/library/basetracktablemodel.h1
-rw-r--r--src/library/browse/browsetablemodel.cpp1
-rw-r--r--src/library/browse/browsethread.cpp7
-rw-r--r--src/library/coverart.cpp1
-rw-r--r--src/library/coverartcache.h2
-rw-r--r--src/library/coverartutils.cpp1
-rw-r--r--src/library/coverartutils.h8
-rw-r--r--src/library/crate/cratefeature.h15
-rw-r--r--src/library/dao/autodjcratesdao.cpp1
-rw-r--r--src/library/dao/autodjcratesdao.h5
-rw-r--r--src/library/dao/cuedao.cpp1
-rw-r--r--src/library/dao/cuedao.h3
-rw-r--r--src/library/dlgcoverartfullsize.cpp10
-rw-r--r--src/library/dlgcoverartfullsize.h8
-rw-r--r--src/library/dlgtagfetcher.cpp1
-rw-r--r--src/library/dlgtagfetcher.h2
-rw-r--r--src/library/dlgtrackinfo.cpp2
-rw-r--r--src/library/dlgtrackinfo.h5
-rw-r--r--src/library/export/trackexportdlg.h9
-rw-r--r--src/library/export/trackexportwizard.h6
-rw-r--r--src/library/export/trackexportworker.cpp4
-rw-r--r--src/library/export/trackexportworker.h4
-rw-r--r--src/library/externaltrackcollection.h2
-rw-r--r--src/library/library.h7
-rw-r--r--src/library/libraryfeature.h14
-rw-r--r--src/library/previewbuttondelegate.h29
-rw-r--r--src/library/recording/dlgrecording.h2
-rw-r--r--src/library/rekordbox/rekordboxconstants.h5
-rw-r--r--src/library/rekordbox/rekordboxfeature.cpp27
-rw-r--r--src/library/scanner/libraryscanner.h19
-rw-r--r--src/library/scanner/scannerglobal.h10
-rw-r--r--src/library/scanner/scannertask.h1
-rw-r--r--src/library/searchquery.cpp12
-rw-r--r--src/library/searchquery.h11
-rw-r--r--src/library/searchqueryparser.h1
-rw-r--r--src/library/trackcollectionmanager.cpp4
-rw-r--r--src/library/trackloader.h2
-rw-r--r--src/library/trackmodel.h2
-rw-r--r--src/mixer/basetrackplayer.h4
-rw-r--r--src/mixer/playerinfo.cpp1
-rw-r--r--src/mixer/playerinfo.h6
-rw-r--r--src/mixer/playermanager.h5
-rw-r--r--src/mixxx.h2
-rw-r--r--src/musicbrainz/chromaprinter.cpp7
-rw-r--r--src/musicbrainz/chromaprinter.h2
-rw-r--r--src/musicbrainz/tagfetcher.cpp1
-rw-r--r--src/musicbrainz/tagfetcher.h2
-rw-r--r--src/preferences/beatdetectionsettings.h3
-rw-r--r--src/preferences/broadcastsettings.h1
-rw-r--r--src/preferences/dialog/dlgprefbeats.cpp143
-rw-r--r--src/preferences/dialog/dlgprefbeats.h10
-rw-r--r--src/preferences/dialog/dlgprefbeatsdlg.ui44
-rw-r--r--src/preferences/dialog/dlgprefbroadcast.cpp56
-rw-r--r--src/preferences/dialog/dlgprefbroadcastdlg.ui42
-rw-r--r--src/preferences/dialog/dlgprefcrossfader.cpp2
-rw-r--r--src/preferences/dialog/dlgprefdeckdlg.ui15
-rw-r--r--src/preferences/dialog/dlgprefeqdlg.ui15
-rw-r--r--src/preferences/dialog/dlgprefsound.cpp2
-rw-r--r--src/preferences/dialog/dlgprefsounddlg.ui11
-rw-r--r--src/preferences/dialog/dlgprefwaveform.cpp133
-rw-r--r--