summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt19
-rw-r--r--build/depends.py10
-rw-r--r--cmake/modules/FindKeyFinder.cmake86
-rw-r--r--res/controllers/Denon-MC3000-scripts.js2
-rw-r--r--res/controllers/Denon-MC7000-scripts.js4
-rw-r--r--res/controllers/Denon-MC7000.midi.xml4
-rw-r--r--res/controllers/Hercules_DJControl_Inpulse_300.midi.xml2
-rw-r--r--res/controllers/Novation-Launchpad-Mini-scripts.js2
-rw-r--r--res/controllers/Pioneer-DDJ-SB2.midi.xml16
-rw-r--r--res/controllers/Roland_DJ-505-scripts.js2
-rw-r--r--res/controllers/common-controller-scripts.js2
-rw-r--r--res/skins/LateNight/skin.xml6
-rw-r--r--res/skins/LateNight/style.qss2
-rw-r--r--res/skins/Shade/style.qss4
-rw-r--r--res/skins/Tango (64 Samplers)/skin.xml80
-rw-r--r--res/skins/Tango (64 Samplers)/skin_settings.xml4
-rw-r--r--res/skins/Tango/graphics/cover_default_mini_green.svg (renamed from res/skins/Tango/graphics/cover_default_mini_blue.svg)2
-rw-r--r--res/skins/Tango/graphics/spinny_mini_mask_green.svg (renamed from res/skins/Tango/graphics/spinny_mini_mask_blue.svg)2
-rw-r--r--res/skins/Tango/size_detector_deck_controls_toggle.xml2
-rw-r--r--res/skins/Tango/skin.xml92
-rw-r--r--res/skins/Tango/skin_preview.png (renamed from res/skins/Tango/skin_preview_ClubTwist.png)bin119072 -> 119072 bytes
-rw-r--r--res/skins/Tango/skin_preview_Classic.pngbin98637 -> 0 bytes
-rw-r--r--res/skins/Tango/skin_settings.xml4
-rw-r--r--res/skins/Tango/style.qss47
-rwxr-xr-xscripts/qsscheck.py2
-rw-r--r--src/analyzer/analyzerkey.cpp10
-rw-r--r--src/analyzer/plugins/analyzerkeyfinder.cpp115
-rw-r--r--src/analyzer/plugins/analyzerkeyfinder.h40
-rw-r--r--src/broadcast/defs_broadcast.h5
-rw-r--r--src/controllers/colormapper.cpp2
-rw-r--r--src/controllers/dlgprefcontroller.cpp18
-rw-r--r--src/controllers/dlgprefcontroller.h6
-rw-r--r--src/controllers/dlgprefcontrollers.cpp13
-rw-r--r--src/controllers/dlgprefcontrollers.h1
-rw-r--r--src/defs_urls.h20
-rw-r--r--src/dialog/dlgabout.cpp3
-rw-r--r--src/encoder/encoderwave.cpp2
-rw-r--r--src/engine/channels/engineaux.cpp4
-rw-r--r--src/engine/channels/enginechannel.cpp7
-rw-r--r--src/engine/channels/enginechannel.h14
-rw-r--r--src/engine/channels/enginedeck.cpp13
-rw-r--r--src/engine/channels/enginedeck.h9
-rw-r--r--src/engine/channels/enginemicrophone.cpp6
-rw-r--r--src/engine/controls/bpmcontrol.cpp135
-rw-r--r--src/engine/controls/bpmcontrol.h12
-rw-r--r--src/engine/controls/clockcontrol.cpp28
-rw-r--r--src/engine/controls/clockcontrol.h6
-rw-r--r--src/engine/controls/cuecontrol.cpp7
-rw-r--r--src/engine/controls/cuecontrol.h2
-rw-r--r--src/engine/controls/enginecontrol.cpp4
-rw-r--r--src/engine/controls/enginecontrol.h1
-rw-r--r--src/engine/controls/loopingcontrol.cpp29
-rw-r--r--src/engine/controls/loopingcontrol.h5
-rw-r--r--src/engine/controls/quantizecontrol.cpp24
-rw-r--r--src/engine/controls/quantizecontrol.h7
-rw-r--r--src/engine/enginebuffer.cpp89
-rw-r--r--src/engine/enginebuffer.h1
-rw-r--r--src/engine/enginemaster.cpp13
-rw-r--r--src/engine/sidechain/shoutconnection.cpp6
-rw-r--r--src/engine/sync/basesyncablelistener.cpp30
-rw-r--r--src/engine/sync/basesyncablelistener.h20
-rw-r--r--src/engine/sync/enginesync.cpp484
-rw-r--r--src/engine/sync/enginesync.h17
-rw-r--r--src/engine/sync/internalclock.cpp64
-rw-r--r--src/engine/sync/internalclock.h8
-rw-r--r--src/engine/sync/syncable.h29
-rw-r--r--src/engine/sync/synccontrol.cpp200
-rw-r--r--src/engine/sync/synccontrol.h12
-rw-r--r--src/library/autodj/dlgautodj.cpp2
-rw-r--r--src/library/basecoverartdelegate.h2
-rw-r--r--src/library/basesqltablemodel.cpp5
-rw-r--r--src/library/basetrackcache.cpp34
-rw-r--r--src/library/basetrackcache.h6
-rw-r--r--src/library/basetracktablemodel.cpp9
-rw-r--r--src/library/browse/browsethread.cpp17
-rw-r--r--src/library/dao/trackdao.cpp70
-rw-r--r--src/library/dao/trackdao.h21
-rw-r--r--src/library/dlganalysis.cpp2
-rw-r--r--src/library/dlghidden.cpp2
-rw-r--r--src/library/dlgmissing.cpp2
-rw-r--r--src/library/dlgtrackinfo.cpp5
-rw-r--r--src/library/dlgtrackinfo.ui285
-rw-r--r--src/library/externaltrackcollection.h2
-rw-r--r--src/library/library.cpp3
-rw-r--r--src/library/librarycontrol.cpp75
-rw-r--r--src/library/librarycontrol.h7
-rw-r--r--src/library/recording/dlgrecording.cpp2
-rw-r--r--src/library/rekordbox/rekordbox_anlz.cpp27
-rw-r--r--src/library/rekordbox/rekordbox_anlz.h29
-rw-r--r--src/library/rekordbox/rekordbox_anlz.ksy509
-rw-r--r--src/library/rekordbox/rekordbox_pdb.ksy975
-rw-r--r--src/library/rekordbox/rekordboxfeature.cpp6
-rw-r--r--src/library/scanner/libraryscanner.cpp3
-rw-r--r--src/library/serato/seratofeature.cpp2
-rw-r--r--src/library/trackcollection.cpp22
-rw-r--r--src/library/trackcollection.h3
-rw-r--r--src/library/trackcollectionmanager.cpp16
-rw-r--r--src/mixer/basetrackplayer.cpp52
-rw-r--r--src/mixer/basetrackplayer.h19
-rw-r--r--src/mixer/deck.cpp17
-rw-r--r--src/mixer/playermanager.cpp16
-rw-r--r--src/mixer/previewdeck.cpp17
-rw-r--r--src/mixer/sampler.cpp17
-rw-r--r--src/network/webtask.cpp2
-rw-r--r--src/network/webtask.h2
-rw-r--r--src/preferences/broadcastprofile.cpp5
-rw-r--r--src/preferences/broadcastsettings_legacy.cpp13
-rw-r--r--src/preferences/dialog/dlgprefbeats.cpp5
-rw-r--r--src/preferences/dialog/dlgprefbeats.h2
-rw-r--r--src/preferences/dialog/dlgprefbroadcast.cpp11
-rw-r--r--src/preferences/dialog/dlgprefbroadcast.h2
-rw-r--r--src/preferences/dialog/dlgprefcolors.cpp2
-rw-r--r--src/preferences/dialog/dlgprefeq.cpp20
-rw-r--r--src/preferences/dialog/dlgprefeq.h2
-rw-r--r--src/preferences/dialog/dlgpreferences.cpp22
-rw-r--r--src/preferences/dialog/dlgpreferencesdlg.ui2
-rw-r--r--src/preferences/dialog/dlgprefkey.cpp5
-rw-r--r--src/preferences/dialog/dlgprefkey.h7
-rw-r--r--src/preferences/dialog/dlgpreflibrary.cpp4
-rw-r--r--src/preferences/dialog/dlgpreflibrary.h9
-rw-r--r--src/preferences/dialog/dlgpreflibrarydlg.ui38
-rw-r--r--src/preferences/dialog/dlgprefsound.cpp4
-rw-r--r--src/preferences/dialog/dlgprefsound.h9
-rw-r--r--src/preferences/dialog/dlgprefvinyl.cpp4
-rw-r--r--src/preferences/dialog/dlgprefvinyl.h2
-rw-r--r--src/preferences/dlgpreferencepage.cpp6
-rw-r--r--src/preferences/dlgpreferencepage.h7
-rw-r--r--src/skin/launchimage.h2
-rw-r--r--src/skin/legacyskinparser.cpp8
-rw-r--r--src/skin/skincontext.h2
-rw-r--r--src/sources/metadatasource.h2
-rw-r--r--src/sources/metadatasourcetaglib.cpp86
-rw-r--r--src/sources/metadatasourcetaglib.h4
-rw-r--r--src/sources/soundsource.cpp2
-rw-r--r--src/sources/soundsource.h2
-rw-r--r--src/sources/soundsourceproxy.cpp12
-rw-r--r--src/sources/soundsourceproxy.h5
-rw-r--r--src/sources/soundsourcewv.h2
-rw-r--r--src/test/enginemastertest.cpp7
-rw-r--r--src/test/enginesynctest.cpp790