summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxerus2000 <27jf@pm.me>2020-06-05 09:49:27 +0200
committerxerus2000 <27jf@pm.me>2020-06-05 09:49:27 +0200
commiteb756ee61a4007f3ad91195c57f85e3786f8e1cc (patch)
tree49397a6a9209200a86bbca0610b33bcc339ad879
parentf8d44a455a21ac0e108914df0980a144bdbb63a3 (diff)
parentc010fffcae27d48bf4e418c59f6893af2ffe19db (diff)
Merge branch 'master' into refactor-basetrackset
-rw-r--r--.travis.yml31
-rw-r--r--CHANGELOG.md1
-rw-r--r--CMakeLists.txt325
-rw-r--r--build/features.py9
-rw-r--r--lib/libshout/CMakeLists.txt5
-rw-r--r--res/controllers/Denon-MC6000MK2-scripts.js888
-rw-r--r--res/controllers/Denon-MC6000MK2.midi.xml108
-rw-r--r--res/controllers/Numark-N4-scripts.js1285
-rw-r--r--res/controllers/Roland_DJ-505-scripts.js3
-rw-r--r--res/skins/Deere (64 Samplers)/skin.xml1
-rw-r--r--res/skins/Deere (64 Samplers)/skin_settings.xml9
-rw-r--r--res/skins/Deere/deck_small.xml4
-rw-r--r--res/skins/Deere/deck_text_row.xml58
-rw-r--r--res/skins/Deere/icon/ic_hotcues_earlier_48px.svg35
-rw-r--r--res/skins/Deere/icon/ic_hotcues_later_48px.svg35
-rw-r--r--res/skins/Deere/sampler_text_row.xml2
-rw-r--r--res/skins/Deere/skin.xml1
-rw-r--r--res/skins/Deere/skin_settings.xml3
-rw-r--r--res/skins/Deere/style.qss4
-rw-r--r--res/skins/LateNight/buttons_classic/btn__beat_curpos_large.svg60
-rw-r--r--res/skins/LateNight/buttons_classic/btn__hotcues_earlier.svg38
-rw-r--r--res/skins/LateNight/buttons_classic/btn__hotcues_later.svg38
-rw-r--r--res/skins/LateNight/buttons_flip/btn__hotcues_earlier.svg38
-rw-r--r--res/skins/LateNight/buttons_flip/btn__hotcues_later.svg38
-rw-r--r--res/skins/LateNight/deck_mini.xml4
-rw-r--r--res/skins/LateNight/deck_row_2_3_TitleArtistTime.xml2
-rw-r--r--res/skins/LateNight/sampler.xml2
-rw-r--r--res/skins/LateNight/sampler_mini.xml2
-rw-r--r--res/skins/LateNight/skin.xml3
-rw-r--r--res/skins/LateNight/skin_settings.xml9
-rw-r--r--res/skins/LateNight/style.qss6
-rw-r--r--res/skins/LateNight/style_flip.qss6
-rw-r--r--res/skins/LateNight/waveform.xml65
-rw-r--r--res/skins/Shade/deck.xml2
-rw-r--r--res/skins/Shade/deck_small.xml5
-rw-r--r--res/skins/Shade/sampler.xml3
-rw-r--r--res/skins/Shade/samplersmall.xml3
-rw-r--r--res/skins/Tango (64 Samplers)/skin.xml1
-rw-r--r--res/skins/Tango (64 Samplers)/skin_settings.xml7
-rw-r--r--res/skins/Tango/buttons/btn_hotcues_earlier.svg38
-rw-r--r--res/skins/Tango/buttons/btn_hotcues_later.svg38
-rw-r--r--res/skins/Tango/deck_left_mini.xml4
-rw-r--r--res/skins/Tango/deck_right_mini.xml2
-rw-r--r--res/skins/Tango/deck_row_text_left.xml2
-rw-r--r--res/skins/Tango/deck_row_text_right.xml2
-rw-r--r--res/skins/Tango/sampler.xml6
-rw-r--r--res/skins/Tango/skin.xml1
-rw-r--r--res/skins/Tango/skin_settings.xml3
-rw-r--r--res/skins/Tango/style.qss15
-rw-r--r--res/skins/Tango/waveform.xml73
-rw-r--r--shell.nix (renamed from default.nix)90
-rw-r--r--src/analyzer/analyzerebur128.h2
-rw-r--r--src/analyzer/analyzergain.h2
-rw-r--r--src/broadcast/broadcastmanager.h2
-rw-r--r--src/controllers/controllerinputmappingtablemodel.cpp10
-rw-r--r--src/controllers/controlleroutputmappingtablemodel.cpp10
-rw-r--r--src/controllers/dlgprefcontroller.h6
-rw-r--r--src/controllers/hid/hidcontrollerpreset.h6
-rw-r--r--src/controllers/midi/midicontrollerpreset.cpp18
-rw-r--r--src/controllers/midi/midicontrollerpreset.h20
-rw-r--r--src/dialog/dlgabout.cpp4
-rw-r--r--src/dialog/dlgreplacecuecolor.cpp4
-rw-r--r--src/effects/effectsmanager.cpp6
-rw-r--r--src/effects/effectsmanager.h9
-rw-r--r--src/encoder/encoder.h4
-rw-r--r--src/encoder/encoderflacsettings.cpp34
-rw-r--r--src/encoder/encoderflacsettings.h7
-rw-r--r--src/encoder/encodermp3.h2
-rw-r--r--src/encoder/encodermp3settings.cpp32
-rw-r--r--src/encoder/encodermp3settings.h6
-rw-r--r--src/encoder/encoderopus.cpp22
-rw-r--r--src/encoder/encoderopussettings.h1
-rw-r--r--src/encoder/encoderrecordingsettings.h5
-rw-r--r--src/encoder/encodersndfileflac.cpp9
-rw-r--r--src/encoder/encodersndfileflac.h6
-rw-r--r--src/encoder/encodervorbis.h6
-rw-r--r--src/encoder/encodervorbissettings.cpp15
-rw-r--r--src/encoder/encodervorbissettings.h2
-rw-r--r--src/encoder/encoderwave.h4
-rw-r--r--src/encoder/encoderwavesettings.cpp27
-rw-r--r--src/encoder/encoderwavesettings.h8
-rw-r--r--src/engine/cachingreader/cachingreader.cpp6
-rw-r--r--src/engine/cachingreader/cachingreader.h16
-rw-r--r--src/engine/channelhandle.h5
-rw-r--r--src/engine/effects/engineeffectchain.h6
-rw-r--r--src/engine/enginemaster.cpp11
-rw-r--r--src/engine/enginemaster.h10
-rw-r--r--src/engine/enginesidechaincompressor.cpp4
-rw-r--r--src/engine/readaheadmanager.cpp8
-rw-r--r--src/engine/readaheadmanager.h70
-rw-r--r--src/engine/sidechain/enginerecord.h2
-rw-r--r--src/engine/sidechain/enginesidechain.h2
-rw-r--r--src/engine/sidechain/networkinputstreamworker.cpp3
-rw-r--r--src/engine/sidechain/networkinputstreamworker.h2
-rw-r--r--src/engine/sidechain/networkoutputstreamworker.cpp3
-rw-r--r--src/engine/sidechain/networkoutputstreamworker.h2
-rw-r--r--src/engine/sidechain/shoutconnection.h3
-rw-r--r--src/engine/sidechain/sidechainworker.h2
-rw-r--r--src/engine/sync/synccontrol.cpp3
-rw-r--r--src/errordialoghandler.h2
-rw-r--r--src/library/basecoverartdelegate.cpp2
-rw-r--r--src/library/basecoverartdelegate.h2
-rw-r--r--src/library/basesqltablemodel.cpp4
-rw-r--r--src/library/basesqltablemodel.h4
-rw-r--r--src/library/basetracktablemodel.cpp4
-rw-r--r--src/library/browse/browsetablemodel.cpp4
-rw-r--r--src/library/browse/browsetablemodel.h2
-rw-r--r--src/library/coverart.cpp13
-rw-r--r--src/library/dao/autodjcratesdao.cpp22
-rw-r--r--src/library/dao/autodjcratesdao.h5
-rw-r--r--src/library/dao/playlistdao.cpp19
-rw-r--r--src/library/dao/trackdao.cpp2
-rw-r--r--src/library/dlgcoverartfullsize.cpp4
-rw-r--r--src/library/dlgtrackinfo.cpp2
-rw-r--r--src/library/proxytrackmodel.cpp4
-rw-r--r--src/library/proxytrackmodel.h7
-rw-r--r--src/library/scanner/importfilestask.cpp14
-rw-r--r--src/library/scanner/importfilestask.h28
-rw-r--r--src/library/scanner/recursivescandirectorytask.cpp14
-rw-r--r--src/library/scanner/recursivescandirectorytask.h15
-rw-r--r--src/library/trackmodel.h13
-rw-r--r--src/library/trackset/setlogfeature.cpp10
-rw-r--r--src/library/trackset/setlogfeature.h3
-rw-r--r--src/library/treeitemmodel.cpp2
-rw-r--r--src/main.cpp2
-rw-r--r--src/mixer/auxiliary.h2
-rw-r--r--src/mixer/baseplayer.cpp4
-rw-r--r--src/mixer/baseplayer.h2
-rw-r--r--src/mixer/basetrackplayer.cpp124
-rw-r--r--src/mixer/basetrackplayer.h52
-rw-r--r--src/mixer/deck.cpp3
-rw-r--r--src/mixer/deck.h2
-rw-r--r--src/mixer/microphone.h2
-rw-r--r--src/mixer/playerinfo.h4
-rw-r--r--src/mixer/playermanager.h4
-rw-r--r--src/mixer/previewdeck.cpp3
-rw-r--r--src/mixer/previewdeck.h2
-rw-r--r--src/mixer/sampler.cpp3
-rw-r--r--src/mixer/sampler.h2
-rw-r--r--src/mixer/samplerbank.h2