Skip to content

Commit e1d36e1

Browse files
m0dBm0dB
m0dB
authored and
m0dB
committed
Merge branch 'fix-14326-correct' into dmx512usb
2 parents 3cf6a02 + 2acadf0 commit e1d36e1

15 files changed

+2610
-94
lines changed

‎CHANGELOG.md‎

Lines changed: 83 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,95 @@
44

55
### Controller Mappings
66

7-
* Numark NS6II: Add new controller mapping [#11075](https://github.com/mixxxdj/mixxx/pull/11075)
8-
* Hercules Inpulse 300: Updated mapping [#14051](https://github.com/mixxxdj/mixxx/pull/14051)
7+
* Behringer DDM4000 & BCR2000: Update mappings to 2.5 [#14232](https://github.com/mixxxdj/mixxx/pull/14232)
8+
* Hercules Inpulse 300: add toneplay, slicer, and beatmatch functionalities
9+
[#14051](https://github.com/mixxxdj/mixxx/pull/14051)
10+
[#14057](https://github.com/mixxxdj/mixxx/pull/14057)
11+
* Numark NS6II: New mapping [#11075](https://github.com/mixxxdj/mixxx/pull/11075)
12+
* Numark Platinum FX: New mapping [#12872](https://github.com/mixxxdj/mixxx/pull/12872)
13+
* Pioneer-DDJ-SB3: Fixes slip mode and adds missing knob controls [#11307](https://github.com/mixxxdj/mixxx/pull/11307)
14+
* Reloop Digital Jockey 2 IE: New mapping [#4614](https://github.com/mixxxdj/mixxx/pull/4614)
15+
* Traktor S4mk3: Set 4 decks, avoid CO warnings for decks 3/4, eg. VU meter
16+
[#14249](https://github.com/mixxxdj/mixxx/pull/14249)
17+
* Traktor S4mk3: Smooth xfader curve for Const Power mode [#14305](https://github.com/mixxxdj/mixxx/pull/14305)
18+
* Traktor Kontrol S3: Use pitch absolute mode as described in the manual [#14123](https://github.com/mixxxdj/mixxx/pull/14123)
919

10-
### Fixes
20+
### Skins
1121

1222
* Deere (64 samplers): Bring back library in regular view
1323
[#14101](https://github.com/mixxxdj/mixxx/pull/14101)
1424
[#14097](https://github.com/mixxxdj/mixxx/issues/14097)
25+
* Fix crash when hiding waveforms in Deere
26+
[#14170](https://github.com/mixxxdj/mixxx/pull/14170)
27+
* Waveform Overview: Abort play pos dragging if cursor is released outside the valid area
28+
[#13741](https://github.com/mixxxdj/mixxx/pull/13741)
29+
[#13732](https://github.com/mixxxdj/mixxx/issues/13732)
30+
* Waveform Overview: Also render analysis progress when triggered by track menu or analysis feature [#14150](https://github.com/mixxxdj/mixxx/pull/14150)
31+
* Don't show 'menubar hide' dialog when switching skins [#14254](https://github.com/mixxxdj/mixxx/pull/14254)
32+
* Key Wheel: Move to View menu and make it a floating tool window
33+
[#14256](https://github.com/mixxxdj/mixxx/pull/14256)
34+
[#14239](https://github.com/mixxxdj/mixxx/pull/14239)
35+
36+
### Fixes
37+
1538
* Enable R3 time-stretching with Rubberband 4.0.0 API version numbers [#14100](https://github.com/mixxxdj/mixxx/pull/14100)
39+
* Library: Add Ctrl+Shift+C to copy the content of the selected cell(s) (The Mxxx 2.4 behaviour of Ctrl+C).
40+
[#14114](https://github.com/mixxxdj/mixxx/pull/14114)
41+
[#14065](https://github.com/mixxxdj/mixxx/issues/14065)
42+
* Preferences Effects: add Hide/Unhide (move) buttons to Effects tab [#13329](https://github.com/mixxxdj/mixxx/pull/13329)
43+
* Fix MusicBrainz lookup on Windows and macOS [#14216](https://github.com/mixxxdj/mixxx/pull/14216)
44+
* Controller Learning: Correct skin control for mic/aux section [#14221](https://github.com/mixxxdj/mixxx/pull/14221)
45+
* Apply talkover ducking after master effects to allow using a compressor effect
46+
[#13844](https://github.com/mixxxdj/mixxx/pull/13844)
47+
[#12451](https://github.com/mixxxdj/mixxx/issues/12451)
48+
* Fix for `TypeError` in `midi-components-0.0.js`
49+
[#14203](https://github.com/mixxxdj/mixxx/pull/14203)
50+
[#14197](https://github.com/mixxxdj/mixxx/issues/14197)
51+
* Library scanner: Update cached 'missing' flag when file is redicovered
52+
[#14250](https://github.com/mixxxdj/mixxx/pull/14250)
53+
* Controller preference: Fix notify of pending changes when closing preferences [#14234](https://github.com/mixxxdj/mixxx/pull/14234)
54+
[#14220](https://github.com/mixxxdj/mixxx/issues/14220)
55+
* Controller preferences: Fix broken overwrite dialog ('Save as..' not working) [#14263](https://github.com/mixxxdj/mixxx/pull/14263)
56+
* Controller preferences: Don't break support link texts [#14079](https://github.com/mixxxdj/mixxx/pull/14079)
57+
* MIDI controller learning: Make control box search usable [#14260](https://github.com/mixxxdj/mixxx/pull/14260)
58+
* Hidden Tracks: Allow 'load to' via track context manu [#14077](https://github.com/mixxxdj/mixxx/pull/14077)
59+
* MIDI controller learning: don't reload mapping after learn [#14253](https://github.com/mixxxdj/mixxx/pull/14253)
60+
* Controller preferences: Fix wrong mapping change confirmation request caused by MidiController::makeInputHandler()
61+
[#14281](https://github.com/mixxxdj/mixxx/pull/14281)
62+
[#14280](https://github.com/mixxxdj/mixxx/issues/14280)
63+
[#14292](https://github.com/mixxxdj/mixxx/pull/14292)
64+
* Allow `midino` 0 in `MidiController::makeInputHandler()
65+
[#14266](https://github.com/mixxxdj/mixxx/pull/14266)
66+
[#14265](https://github.com/mixxxdj/mixxx/issues/14265)
67+
* Update to libdjinterop 0.24.3 - support for Engine 4.1/4.2
68+
[#14172](https://github.com/mixxxdj/mixxx/pull/14172)
69+
[#14289](https://github.com/mixxxdj/mixxx/pull/14289)
70+
* Fix sporadic deadlocks when closing Mixxx or changing sound devices
71+
[#14208](https://github.com/mixxxdj/mixxx/pull/14208)
72+
[#14055](https://github.com/mixxxdj/mixxx/issues/14055)
73+
74+
### Target support
75+
76+
* Allow to build with git "showSignature = true"
77+
[#14115](https://github.com/mixxxdj/mixxx/pull/14115)
78+
[#12997](https://github.com/mixxxdj/mixxx/issues/12997)
79+
* Support building with Qt 6.8/6.9
80+
[#14080](https://github.com/mixxxdj/mixxx/pull/14080)
81+
[#14071](https://github.com/mixxxdj/mixxx/issues/14071)
82+
[#14200](https://github.com/mixxxdj/mixxx/pull/14200)
83+
[#14204](https://github.com/mixxxdj/mixxx/pull/14204)
84+
* Welcome Ubuntu Plucky Puffin; Good bye Mantic Minotaur
85+
[#14148](https://github.com/mixxxdj/mixxx/pull/14148)
86+
[#14158](https://github.com/mixxxdj/mixxx/pull/14158)
87+
* Add more translations to Linux desktop file
88+
[#14153](https://github.com/mixxxdj/mixxx/pull/14153)
89+
[#14169](https://github.com/mixxxdj/mixxx/pull/14169)
90+
* Debian: recommend qt6-translations-l10n [#14147](https://github.com/mixxxdj/mixxx/pull/14147)
91+
* Update FindFFTW3.cmake to not find version 2
92+
[#13937](https://github.com/mixxxdj/mixxx/pull/13937)
93+
[#13931](https://github.com/mixxxdj/mixxx/issues/13931)
94+
* Allow building without tests-tools via new CMake options BUILD_TESTING and BUILD_BENCH
95+
[#14269](https://github.com/mixxxdj/mixxx/pull/14269)
1696

1797
## [2.5.0](https://github.com/mixxxdj/mixxx/issues?q=milestone%3A2.5.0) (2024-12-24)
1898

‎CMakeLists.txt‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,22 @@ function(FATAL_ERROR_MISSING_ENV)
5656
message(FATAL_ERROR "Did you download the Mixxx build environment using `${CMAKE_SOURCE_DIR}/tools/windows_release_buildenv.bat` or `${CMAKE_SOURCE_DIR}/tools/windows_buildenv.bat`(includes Debug)?")
5757
endif()
5858
elseif(APPLE AND NOT IOS)
59-
if(CMAKE_BUILD_TYPE MATCHES "Debug")
59+
if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
60+
message(FATAL_ERROR "Did you build the Mixxx build environment as described here: https://github.com/mixxxdj/mixxx/wiki/Compiling-dependencies-for-macOS-arm64?")
61+
elseif(CMAKE_BUILD_TYPE MATCHES "Debug")
6062
message(FATAL_ERROR "Did you download the Mixxx build environment using `${CMAKE_SOURCE_DIR}/tools/macos_buildenv.sh`")
6163
else()
6264
message(FATAL_ERROR "Did you download the Mixxx build environment using `${CMAKE_SOURCE_DIR}/tools/macos_release_buildenv.sh` or `${CMAKE_SOURCE_DIR}/tools/macos_buildenv.sh`(includes Debug)?")
6365
endif()
64-
elseif(LINUX)
65-
message(FATAL_ERROR "Did you install the Debian dev packages via `${CMAKE_SOURCE_DIR}/tools/debian_buildenv.sh` or the equivalent packages using your package manager?")
66+
elseif(UNIX AND NOT APPLE)
67+
# Linux, BSD, Solaris, Minix
68+
if(EXISTS "/etc/debian_version") # exists also on Ubuntu and Mint
69+
message(FATAL_ERROR "Did you install the required Debian dev packages via `${CMAKE_SOURCE_DIR}/tools/debian_buildenv.sh`?")
70+
elseif(EXISTS "/etc/redhat-release") # exists also on Fedora Mageia Madndriva Alma CentOS
71+
message(FATAL_ERROR "Did you install the required RPM dev packages via `${CMAKE_SOURCE_DIR}/tools/rpm_buildenv.sh`?")
72+
else()
73+
message(FATAL_ERROR "Did you install the equivalent dev packages listed in `${CMAKE_SOURCE_DIR}/tools/debian_buildenv.sh`?")
74+
endif()
6675
elseif(DEFINED VCPKG_TARGET_TRIPLET)
6776
message(FATAL_ERROR "You are targeting ${VCPKG_TARGET_TRIPLET}, which does not have a prebuilt environment. Please make sure that -DMIXXX_VCPKG_ROOT points to a vcpkg environment containing installed dependencies for ${VCPKG_TARGET_TRIPLET}!")
6877
else()

‎res/controllers/Pioneer-DDJ-SB3-scripts.js‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -654,10 +654,9 @@ PioneerDDJSB3.bindDeckControlConnections = function(channelGroup, isUnbinding) {
654654
"pfl": PioneerDDJSB3.headphoneCueLed,
655655
"keylock": PioneerDDJSB3.keyLockLed,
656656
"loop_enabled": PioneerDDJSB3.autoLoopLed,
657+
"slip_enabled": PioneerDDJSB3.slipLed,
657658
};
658659

659-
controlsToFunctions.slipEnabled = PioneerDDJSB3.slipLed;
660-
661660
for (i = 1; i <= 8; i++) {
662661
controlsToFunctions["hotcue_" + i + "_enabled"] = PioneerDDJSB3.hotCueLeds;
663662
}
@@ -771,7 +770,7 @@ PioneerDDJSB3.vinylButton = function(channel, control, value, status, group) {
771770

772771
PioneerDDJSB3.slipButton = function(channel, control, value, status, group) {
773772
if (value) {
774-
script.toggleControl(group, "slipEnabled");
773+
script.toggleControl(group, "slip_enabled");
775774
}
776775
};
777776

@@ -1210,11 +1209,11 @@ PioneerDDJSB3.jogTouch = function(channel, control, value, status, group) {
12101209
} else {
12111210
engine.scratchDisable(deck + 1, true);
12121211

1213-
if (engine.getValue(group, "slipEnabled")) {
1214-
engine.setValue(group, "slipEnabled", false);
1212+
if (engine.getValue(group, "slip_enabled")) {
1213+
engine.setValue(group, "slip_enabled", false);
12151214

12161215
engine.beginTimer(250, () => {
1217-
engine.setValue(group, "slipEnabled", true);
1216+
engine.setValue(group, "slip_enabled", true);
12181217
}, true);
12191218
}
12201219
}
@@ -1416,6 +1415,11 @@ PioneerDDJSB3.EffectUnit = function(unitNumber) {
14161415
},
14171416
});
14181417

1418+
this.shiftKnob = new components.Pot({
1419+
inKey: "super1",
1420+
group: eu.group
1421+
});
1422+
14191423
this.knobSoftTakeoverHandler = engine.makeConnection(eu.group, "focused_effect", function(value) {
14201424
if (value === 0) {
14211425
engine.softTakeoverIgnoreNextValue(eu.group, "mix");

‎res/controllers/Pioneer-DDJ-SB3.midi.xml‎

Lines changed: 51 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,6 +1255,46 @@
12551255
<script-binding/>
12561256
</options>
12571257
</control>
1258+
<control>
1259+
<group>[Master]</group>
1260+
<key>gain</key>
1261+
<description>Master Level</description>
1262+
<status>0xB6</status>
1263+
<midino>0x08</midino>
1264+
<options>
1265+
<fourteen-bit-msb/>
1266+
</options>
1267+
</control>
1268+
<control>
1269+
<group>[Master]</group>
1270+
<key>gain</key>
1271+
<description>Master Level</description>
1272+
<status>0xB6</status>
1273+
<midino>0x28</midino>
1274+
<options>
1275+
<fourteen-bit-lsb/>
1276+
</options>
1277+
</control>
1278+
<control>
1279+
<group>[Master]</group>
1280+
<key>headGain</key>
1281+
<description>Headphones Level</description>
1282+
<status>0xB6</status>
1283+
<midino>0x0D</midino>
1284+
<options>
1285+
<fourteen-bit-msb/>
1286+
</options>
1287+
</control>
1288+
<control>
1289+
<group>[Master]</group>
1290+
<key>headGain</key>
1291+
<description>Headphones Level</description>
1292+
<status>0xB6</status>
1293+
<midino>0x2D</midino>
1294+
<options>
1295+
<fourteen-bit-lsb/>
1296+
</options>
1297+
</control>
12581298
<control>
12591299
<group>[Playlist]</group>
12601300
<key>PioneerDDJSB3.rotarySelector</key>
@@ -1456,21 +1496,21 @@
14561496
</options>
14571497
</control>
14581498
<control>
1459-
<group>[EffectRack1_EffectUnit]</group>
1460-
<key>PioneerDDJSB3.effectUnit[1].knob.inputMSB</key>
1499+
<group>[EffectRack1_EffectUnit1]</group>
1500+
<key>PioneerDDJSB3.effectUnit[1].shiftKnob.inputMSB</key>
14611501
<description>Shift FX1 (MSB), Knob: left SHIFT &amp; FX1</description>
14621502
<status>0xB4</status>
1463-
<midino>0x00</midino>
1503+
<midino>0x12</midino>
14641504
<options>
14651505
<script-binding/>
14661506
</options>
14671507
</control>
14681508
<control>
1469-
<group>[EffectRack1_EffectUnit]</group>
1470-
<key>PioneerDDJSB3.effectUnit[1].knob.inputLSB</key>
1509+
<group>[EffectRack1_EffectUnit1]</group>
1510+
<key>PioneerDDJSB3.effectUnit[1].shiftKnob.inputLSB</key>
14711511
<description>Shift FX1 (LSB), Knob: left SHIFT &amp; FX1</description>
14721512
<status>0xB4</status>
1473-
<midino>0x20</midino>
1513+
<midino>0x32</midino>
14741514
<options>
14751515
<script-binding/>
14761516
</options>
@@ -1557,20 +1597,20 @@
15571597
</control>
15581598
<control>
15591599
<group>[EffectRack1_EffectUnit2]</group>
1560-
<key>PioneerDDJSB3.effectUnit[2].knob.inputMSB</key>
1600+
<key>PioneerDDJSB3.effectUnit[2].shiftKnob.inputMSB</key>
15611601
<description>Shift FX2 (MSB), Knob: right SHIFT &amp; FX1</description>
15621602
<status>0xB5</status>
1563-
<midino>0x00</midino>
1603+
<midino>0x12</midino>
15641604
<options>
15651605
<script-binding/>
15661606
</options>
15671607
</control>
15681608
<control>
1569-
<group>[Channel2]</group>
1570-
<key>PioneerDDJSB3.effectUnit[2].knob.inputLSB</key>
1609+
<group>[EffectRack1_EffectUnit2]</group>
1610+
<key>PioneerDDJSB3.effectUnit[2].shiftKnob.inputLSB</key>
15711611
<description>Shift FX2 (LSB), Knob: right SHIFT &amp; FX2</description>
15721612
<status>0xB5</status>
1573-
<midino>0x20</midino>
1613+
<midino>0x32</midino>
15741614
<options>
15751615
<script-binding/>
15761616
</options>

0 commit comments

Comments
 (0)