summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpcktm <jakub@kopanko.com>2023-06-09 21:27:07 +0200
committerpcktm <jakub@kopanko.com>2023-06-09 21:27:07 +0200
commit1ed62299701ade2cfa19f774149d8f90fd986bef (patch)
treebf6fc90c9d83f8dde6ec187106ba38b78a176181
parentcfbc224d0abf4e0826aa0d46589dafe98faf9e9b (diff)
parent018cb521b27bc1e7b1abf37c039a8de179fd97da (diff)
Merge branch 'main' into GlitchEffect
-rw-r--r--.clang-format31
-rw-r--r--.codespellignorelines1
-rw-r--r--.eslintrc.json14
-rw-r--r--.github/workflows/build.yml55
-rw-r--r--.github/workflows/labeler.yml8
-rw-r--r--.github/workflows/pre-commit.yml7
-rw-r--r--.github/workflows/stale.yml2
-rw-r--r--.pre-commit-config.yaml11
-rw-r--r--.tx/config10
-rw-r--r--CHANGELOG.md782
-rw-r--r--CMakeLists.txt206
-rw-r--r--CONTRIBUTING.md2
-rw-r--r--cmake/modules/BundleInstall.cmake.in2
-rw-r--r--cmake/modules/FindDjInterop.cmake9
-rw-r--r--cmake/modules/GitInfo.cmake18
-rw-r--r--lib/benchmark/src/benchmark.cc2
-rw-r--r--lib/fidlib/fidlib.c443
-rw-r--r--lib/fidlib/fidrf_cmdlist.h178
-rw-r--r--lib/libshout-idjc/src/common/net/sock.c6
-rw-r--r--lib/mp3guessenc-0.27.4/decode.c4
-rw-r--r--lib/xwax/0005-Fix-traktor-math-issues-for-timecoder-bad-values-lp-.patch2
-rw-r--r--packaging/debian/changelog12
-rw-r--r--packaging/macos/Info.plist.in (renamed from packaging/macos/bundle.plist.in)3
-rw-r--r--packaging/macos/Mixxx.entitlements (renamed from packaging/macos/entitlements.plist)0
-rw-r--r--packaging/macos/build_environment2
-rwxr-xr-xpackaging/macos/sign_notarize_staple.sh2
-rw-r--r--packaging/windows/build_environment1
-rw-r--r--res/controllers/Behringer-CMDStudio4a-scripts.js2
-rw-r--r--res/controllers/Electrix-Tweaker-scripts.js1492
-rw-r--r--res/controllers/Hercules DJ Control MP3 e2-scripts.js2
-rw-r--r--res/controllers/Hercules P32 DJ.midi.xml8
-rw-r--r--res/controllers/Hercules-DJ-Console-RMX-scripts.js2
-rw-r--r--res/controllers/Hercules-P32-scripts.js13
-rw-r--r--res/controllers/Numark_DJ2GO2_Touch.midi.xml9
-rw-r--r--res/controllers/Pioneer-DDJ-400-script.js95
-rw-r--r--res/controllers/Pioneer-DDJ-400.midi.xml30
-rw-r--r--res/controllers/Reloop-Beatmix-2-4-scripts.js295
-rw-r--r--res/controllers/Reloop-Beatpad-scripts.js2
-rw-r--r--res/controllers/Roland_DJ-505-scripts.js6
-rw-r--r--res/controllers/Traktor Kontrol S4 MK3.hid.xml17
-rw-r--r--res/controllers/Traktor-Kontrol-S4-MK3.js3157
-rw-r--r--res/controllers/color-mapper-api.d.ts29
-rw-r--r--res/controllers/common-controller-scripts.js132
-rw-r--r--res/controllers/common-hid-packet-parser.js244
-rw-r--r--res/controllers/console-api.d.ts138
-rw-r--r--res/controllers/engine-api.d.ts283
-rw-r--r--res/controllers/hid-controller-api.d.ts62
-rw-r--r--res/controllers/midi-components-0.0.js4
-rw-r--r--res/controllers/midi-controller-api.d.ts32
-rw-r--r--res/linux/org.mixxx.Mixxx.metainfo.xml1255
-rw-r--r--res/qml/Slider.qml2
-rw-r--r--res/schema.xml2
-rw-r--r--res/skins/Deere/deck_text_row.xml2
-rw-r--r--res/skins/Deere/statuslight_3state.xml2
-rw-r--r--res/skins/Deere/style-mac.qss2
-rw-r--r--res/skins/Deere/style.qss11
-rw-r--r--res/skins/LateNight/classic/style/splitter_handle_horizontal.pngbin160 -> 114 bytes
-rw-r--r--res/skins/LateNight/classic/style/splitter_handle_horizontal_pressed.pngbin160 -> 744 bytes
-rw-r--r--res/skins/LateNight/classic/style/splitter_handle_vertical_pressed.pngbin178 -> 769 bytes
-rw-r--r--res/skins/LateNight/decks/preview_deck.xml2
-rw-r--r--res/skins/LateNight/fx/parameter_button.xml23
-rw-r--r--res/skins/LateNight/fx/parameter_knob.xml26
-rw-r--r--res/skins/LateNight/mixer/channel_4decks.xml13
-rw-r--r--res/skins/LateNight/mixer/channel_left.xml10
-rw-r--r--res/skins/LateNight/mixer/channel_right.xml9
-rw-r--r--res/skins/LateNight/palemoon/style/splitter_handle_vertical.pngbin165 -> 0 bytes
-rw-r--r--res/skins/LateNight/palemoon/style/splitter_handle_vertical.svg16
-rw-r--r--res/skins/LateNight/palemoon/style/splitter_handle_vertical_pressed.pngbin178 -> 0 bytes
-rw-r--r--res/skins/LateNight/palemoon/style/splitter_handle_vertical_pressed.svg12
-rw-r--r--res/skins/LateNight/samplers/sampler_mini.xml2
-rw-r--r--res/skins/LateNight/skin.xml2
-rw-r--r--res/skins/LateNight/skin_settings.xml2
-rw-r--r--res/skins/LateNight/style.qss8
-rw-r--r--res/skins/LateNight/style_classic.qss39
-rw-r--r--res/skins/LateNight/style_palemoon.qss29
-rw-r--r--res/skins/Shade/deck.xml4
-rw-r--r--res/skins/Shade/deck_small.xml4
-rw-r--r--res/skins/Shade/effect_parameter_button.xml9
-rw-r--r--res/skins/Shade/effect_parameter_knob.xml9
-rw-r--r--res/skins/Shade/preview_deck.xml2
-rw-r--r--res/skins/Shade/sampler.xml2
-rw-r--r--res/skins/Shade/samplersmall.xml2
-rw-r--r--res/skins/Shade/style.qss11
-rw-r--r--res/skins/Tango (64 Samplers)/skin_settings.xml2
-rw-r--r--res/skins/Tango/fx/parameter_knob.xml25
-rw-r--r--res/skins/Tango/graphics/vumeter_clipping.pngbin141 -> 0 bytes
-rw-r--r--res/skins/Tango/graphics/vumeter_clipping.svg1
-rw-r--r--res/skins/Tango/graphics/vumeter_clipping_over.pngbin157 -> 0 bytes
-rw-r--r--res/skins/Tango/graphics/vumeter_clipping_over.svg1
-rw-r--r--res/skins/Tango/graphics/vumeter_level.pngbin155 -> 606 bytes
-rw-r--r--res/skins/Tango/graphics/vumeter_level.svg58
-rw-r--r--res/skins/Tango/graphics/vumeter_level_over.pngbin163 -> 761 bytes
-rw-r--r--res/skins/Tango/graphics/vumeter_level_over.svg63
-rw-r--r--res/skins/Tango/graphics/vumeter_mini_clipping.pngbin129 -> 0 bytes
-rw-r--r--res/skins/Tango/graphics/vumeter_mini_clipping.svg2
-rw-r--r--res/skins/Tango/graphics/vumeter_mini_clipping_over.pngbin139 -> 599 bytes
-rw-r--r--res/skins/Tango/graphics/vumeter_mini_clipping_over.svg2
-rw-r--r--res/skins/Tango/graphics/vumeter_mini_level.pngbin139 -> 592 bytes
-rw-r--r--res/skins/Tango/graphics/vumeter_mini_level.svg2
-rw-r--r--res/skins/Tango/mic_aux_sampler/aux_unit.xml2
-rw-r--r--res/skins/Tango/mic_aux_sampler/mic_unit.xml2
-rw-r--r--res/skins/Tango/mic_aux_sampler/sampler.xml2
-rw-r--r--res/skins/Tango/mixer/vumeter_floating.xml2
-rw-r--r--res/skins/Tango/mixer/vumeter_master.xml2
-rw-r--r--res/skins/Tango/mixer/vumeter_mini.xml8
-rw-r--r--res/skins/Tango/mixer/vumeter_mixer.xml2
-rw-r--r--res/skins/Tango/mixer/vumeter_single.xml78
-rw-r--r--res/skins/Tango/skin_settings.xml2
-rw-r--r--res/skins/Tango/style-mac.qss2
-rw-r--r--res/skins/Tango/style.qss14
-rw-r--r--res/translations/mixxx.ts2
-rw-r--r--res/translations/mixxx_ar.ts2
-rw-r--r--res/translations/mixxx_ast.ts2
-rw-r--r--res/translations/mixxx_bg.ts2
-rw-r--r--res/translations/mixxx_br.ts2
-rw-r--r--res/translations/mixxx_bs.ts2
-rw-r--r--res/translations/mixxx_ca.ts4
-rw-r--r--res/translations/mixxx_cmn.ts4
-rw-r--r--res/translations/mixxx_cs.ts4
-rw-r--r--res/translations/mixxx_da.ts2
-rw-r--r--res/translations/mixxx_de.ts6
-rw-r--r--res/translations/mixxx_el.ts4
-rw-r--r--res/translations/mixxx_en_CA.ts4
-rw-r--r--res/translations/mixxx_en_GB.ts4
-rw-r--r--res/translations/mixxx_eo.ts2
-rw-r--r--res/translations/mixxx_es.ts4
-rw-r--r--res/translations/mixxx_es_419.ts4
-rw-r--r--res/translations/mixxx_es_AR.ts4
-rw-r--r--res/translations/mixxx_es_CO.ts4
-rw-r--r--res/translations/mixxx_es_CR.ts4
-rw-r--r--res/translations/mixxx_es_EC.ts4
-rw-r--r--res/translations/mixxx_es_ES.ts4
-rw-r--r--res/translations/mixxx_es_MX.ts4
-rw-r--r--res/translations/mixxx_es_PA.ts4
-rw-r--r--res/translations/mixxx_es_UY.ts4
-rw-r--r--res/translations/mixxx_et.ts2
-rw-r--r--res/translations/mixxx_eu.ts2
-rw-r--r--res/translations/mixxx_fa.ts2