summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoergAtGithub <JoergAtGithub@worldwartweb.com>2021-01-23 10:11:24 +0100
committerJoergAtGithub <JoergAtGithub@worldwartweb.com>2021-01-23 10:11:24 +0100
commit5f2ecff9facd02a7f52a7ad6cbaeca894e6879f2 (patch)
tree62d15b05820ca81cb1cfa698536e88b5b920d8bf
parent80b17af5c3335a66650659b63b10999762405be8 (diff)
parent14bddb65a77a746d103ad64a109d4804cc5b4ffd (diff)
Merge remote-tracking branch 'upstream/2.3' into fix_glgs_waveform_y_scaling
-rw-r--r--.github/workflows/build.yml36
-rw-r--r--.pre-commit-config.yaml4
-rw-r--r--CHANGELOG.md24
-rw-r--r--CMakeLists.txt172
-rw-r--r--COPYING2
-rw-r--r--LICENSE92
-rw-r--r--cmake/modules/FindFFMPEG.cmake166
-rw-r--r--cmake/modules/FindFFmpeg.cmake186
-rw-r--r--cmake/modules/FindHIDAPI.cmake2
-rw-r--r--cmake/modules/FindLilv.cmake87
-rw-r--r--cmake/modules/FindRubberband.cmake86
-rw-r--r--cmake/modules/FindShout.cmake3
-rw-r--r--cmake/modules/FindSndFile.cmake6
-rw-r--r--cmake/modules/FindWavPack.cmake86
-rw-r--r--cmake/modules/Findlilv.cmake88
-rw-r--r--cmake/modules/Findmp3lame.cmake (renamed from cmake/modules/FindLAME.cmake)46
-rw-r--r--cmake/modules/Findrubberband.cmake86
-rw-r--r--cmake/modules/Findwavpack.cmake86
-rw-r--r--lib/libshout/CMakeLists.txt4
-rw-r--r--lib/libshout/config.h4
-rw-r--r--packaging/CPackDebUploadPPA.cmake14
-rw-r--r--packaging/debian/control.in1
-rw-r--r--packaging/debian/mixxx.manpages1
-rwxr-xr-xpackaging/debian/rules7
-rw-r--r--packaging/macos/build_environment4
-rwxr-xr-xpackaging/macos/sign_notarize_staple.sh52
-rw-r--r--res/controllers/Hercules P32 DJ.midi.xml72
-rw-r--r--res/controllers/Hercules-P32-scripts.js259
-rw-r--r--res/images/ic_custom.svg67
-rw-r--r--res/images/ic_mixxx_symbolic.svg1308
-rw-r--r--res/images/ic_none.svg77
-rw-r--r--res/images/preferences/dark/ic_custom.svg5
-rw-r--r--res/images/preferences/dark/ic_mixxx_symbolic.svg186
-rw-r--r--res/images/preferences/dark/ic_none.svg7
-rw-r--r--res/images/preferences/dark/ic_preferences_autodj.svg13
-rw-r--r--res/images/preferences/dark/ic_preferences_bpmdetect.svg7
-rw-r--r--res/images/preferences/dark/ic_preferences_broadcast.svg12
-rw-r--r--res/images/preferences/dark/ic_preferences_colors.svg7
-rw-r--r--res/images/preferences/dark/ic_preferences_controllers.svg4
-rw-r--r--res/images/preferences/dark/ic_preferences_crossfader.svg8
-rw-r--r--res/images/preferences/dark/ic_preferences_decks.svg4
-rw-r--r--res/images/preferences/dark/ic_preferences_effects.svg6
-rw-r--r--res/images/preferences/dark/ic_preferences_equalizers.svg15
-rw-r--r--res/images/preferences/dark/ic_preferences_interface.svg13
-rw-r--r--res/images/preferences/dark/ic_preferences_keydetect.svg8
-rw-r--r--res/images/preferences/dark/ic_preferences_library.svg14
-rw-r--r--res/images/preferences/dark/ic_preferences_lv2.svg4
-rw-r--r--res/images/preferences/dark/ic_preferences_midicontrollers.svg13
-rw-r--r--res/images/preferences/dark/ic_preferences_modplug.svg12
-rw-r--r--res/images/preferences/dark/ic_preferences_recording.svg4
-rw-r--r--res/images/preferences/dark/ic_preferences_replaygain.svg9
-rw-r--r--res/images/preferences/dark/ic_preferences_sampler.svg4
-rw-r--r--res/images/preferences/dark/ic_preferences_soundhardware.svg13
-rw-r--r--res/images/preferences/dark/ic_preferences_vinyl.svg10
-rw-r--r--res/images/preferences/dark/ic_preferences_waveforms.svg4
-rw-r--r--res/images/preferences/ic_preferences_autodj.svg375
-rw-r--r--res/images/preferences/ic_preferences_bpmdetect.svg365
-rw-r--r--res/images/preferences/ic_preferences_broadcast.svg419
-rw-r--r--res/images/preferences/ic_preferences_colors.svg7
-rw-r--r--res/images/preferences/ic_preferences_controllers.svg405
-rw-r--r--res/images/preferences/ic_preferences_crossfader.svg487
-rw-r--r--res/images/preferences/ic_preferences_decks.svg615
-rw-r--r--res/images/preferences/ic_preferences_effects.svg486
-rw-r--r--res/images/preferences/ic_preferences_equalizers.svg796
-rw-r--r--res/images/preferences/ic_preferences_interface.svg646
-rw-r--r--res/images/preferences/ic_preferences_keydetect.svg512
-rw-r--r--res/images/preferences/ic_preferences_library.svg538
-rw-r--r--res/images/preferences/ic_preferences_lv2.svg436
-rw-r--r--res/images/preferences/ic_preferences_midicontrollers.svg560
-rw-r--r--res/images/preferences/ic_preferences_modplug.svg503
-rw-r--r--res/images/preferences/ic_preferences_recording.svg438
-rw-r--r--res/images/preferences/ic_preferences_replaygain.svg610
-rw-r--r--res/images/preferences/ic_preferences_sampler.svg606
-rw-r--r--res/images/preferences/ic_preferences_soundhardware.svg713
-rw-r--r--res/images/preferences/ic_preferences_vinyl.svg673
-rw-r--r--res/images/preferences/ic_preferences_waveforms.svg643
-rw-r--r--res/images/preferences/light/ic_custom.svg5
-rw-r--r--res/images/preferences/light/ic_mixxx_symbolic.svg186
-rw-r--r--res/images/preferences/light/ic_none.svg7
-rw-r--r--res/images/preferences/light/ic_preferences_autodj.svg13
-rw-r--r--res/images/preferences/light/ic_preferences_bpmdetect.svg7
-rw-r--r--res/images/preferences/light/ic_preferences_broadcast.svg12
-rw-r--r--res/images/preferences/light/ic_preferences_colors.svg7
-rw-r--r--res/images/preferences/light/ic_preferences_controllers.svg4
-rw-r--r--res/images/preferences/light/ic_preferences_crossfader.svg8
-rw-r--r--res/images/preferences/light/ic_preferences_decks.svg4
-rw-r--r--res/images/preferences/light/ic_preferences_effects.svg6
-rw-r--r--res/images/preferences/light/ic_preferences_equalizers.svg15
-rw-r--r--res/images/preferences/light/ic_preferences_interface.svg13
-rw-r--r--res/images/preferences/light/ic_preferences_keydetect.svg8
-rw-r--r--res/images/preferences/light/ic_preferences_library.svg14
-rw-r--r--res/images/preferences/light/ic_preferences_lv2.svg4
-rw-r--r--res/images/preferences/light/ic_preferences_midicontrollers.svg13
-rw-r--r--res/images/preferences/light/ic_preferences_modplug.svg12
-rw-r--r--res/images/preferences/light/ic_preferences_recording.svg4
-rw-r--r--res/images/preferences/light/ic_preferences_replaygain.svg9
-rw-r--r--res/images/preferences/light/ic_preferences_sampler.svg4
-rw-r--r--res/images/preferences/light/ic_preferences_soundhardware.svg13
-rw-r--r--res/images/preferences/light/ic_preferences_vinyl.svg10
-rw-r--r--res/images/preferences/light/ic_preferences_waveforms.svg4
-rw-r--r--res/mixxx.qrc74
-rw-r--r--res/skins/Deere/effect_parameter_knob.xml10
-rw-r--r--res/skins/Deere/style.qss2
-rw-r--r--res/skins/LateNight/decks/preview_deck.xml8
-rw-r--r--res/skins/LateNight/library.xml8
-rw-r--r--res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_grey.svg3
-rw-r--r--res/skins/LateNight/palemoon/style/lib_bg.pngbin555 -> 0 bytes
-rw-r--r--res/skins/LateNight/samplers/samplers_16decks.xml32
-rw-r--r--res/skins/LateNight/samplers/samplers_8decks.xml16
-rw-r--r--res/skins/LateNight/style_classic.qss48
-rw-r--r--res/skins/LateNight/style_palemoon.qss102
-rw-r--r--res/translations/mixxx.ts26
-rw-r--r--src/controllers/controllerengine.cpp4
-rw-r--r--src/controllers/controlpickermenu.cpp37
-rw-r--r--src/controllers/dlgprefcontroller.cpp136
-rw-r--r--src/controllers/dlgprefcontroller.h6
-rw-r--r--src/controllers/dlgprefcontrollers.cpp158
-rw-r--r--src/controllers/dlgprefcontrollers.h14
-rw-r--r--src/controllers/dlgprefcontrollersdlg.ui15
-rw-r--r--src/controllers/midi/midicontroller.cpp13
-rw-r--r--src/database/mixxxdb.cpp2
-rw-r--r--src/defs_urls.h29
-rw-r--r--src/dialog/dlgabout.cpp23
-rw-r--r--src/dialog/dlgaboutdlg.ui5
-rw-r--r--src/effects/effectsmanager.cpp2
-rw-r--r--src/effects/effectsmanager.h2
-rw-r--r--src/effects/lv2/lv2backend.h3
-rw-r--r--src/effects/lv2/lv2effectprocessor.h7
-rw-r--r--src/effects/lv2/lv2manifest.h5
-rw-r--r--src/engine/controls/cuecontrol.cpp30
-rw-r--r--src/engine/sidechain/enginerecord.cpp43
-rw-r--r--src/engine/sidechain/shoutconnection.cpp9
-rw-r--r--src/library/basesqltablemodel.cpp10
-rw-r--r--src/library/basesqltablemodel.h4