Skip to content

shared data API #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: feat/s4-mk3-screen-support
Choose a base branch
from
Open

shared data API #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d64f03b
shared data API
acolombier Jan 19, 2025
2924a07
S4MK3: refactor device constant
acolombier Aug 18, 2025
10902bf
S4MK3: improve stability with CO are missings
acolombier Aug 18, 2025
45b8e4e
S4MK3: use button hooks and add shared data API
acolombier Aug 18, 2025
5f39d26
S4MK3: add stem and improve hotcues
acolombier Aug 18, 2025
9dc7f27
S4MK3: add beat jump pad
acolombier Aug 18, 2025
6e42d52
chore: add missing global in ESlint
acolombier Aug 18, 2025
a9ff489
Merge branch 'feat/s4-mk4-improvements' into feat/s4-mk3-screen-suppo…
acolombier Aug 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,6 +1133,7 @@ add_library(
src/controllers/controlpickermenu.cpp
src/controllers/legacycontrollermappingfilehandler.cpp
src/controllers/legacycontrollermapping.cpp
src/controllers/controllershareddata.cpp
src/controllers/delegates/controldelegate.cpp
src/controllers/delegates/midibytedelegate.cpp
src/controllers/delegates/midichanneldelegate.cpp
Expand Down Expand Up @@ -2599,6 +2600,7 @@ if(BUILD_TESTING)
src/test/controller_mapping_settings_test.cpp
src/test/controllers/controller_columnid_regression_test.cpp
src/test/controllerscriptenginelegacy_test.cpp
src/test/controllershareddata_test.cpp
src/test/controlobjecttest.cpp
src/test/controlobjectaliastest.cpp
src/test/controlobjectscripttest.cpp
Expand Down
1 change: 1 addition & 0 deletions eslint.config.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ module.exports = tseslint.config(
// Mixxx custom
"ColorMapper": "readonly",
"components": "readonly",
"controller": "readonly",
"engine": "readonly",
"midi": "readonly",
// common-controller-scripts globals
Expand Down
184 changes: 183 additions & 1 deletion res/controllers/Traktor Kontrol S4 MK3.hid.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,188 @@
</row>
</group>

<group label="Beatjump Size">
<row orientation="vertical">
<option
variable="beatJumpSize1"
type="enum"
label="First Pad">
<value label="Use current beatjump size" default="true">beatjump</value>
<value label="1/32">0.03125</value>
<value label="1/16">0.0625</value>
<value label="1/8">0.125</value>
<value label="1/4">0.25</value>
<value label="1/2">0.5</value>
<value label="1">1</value>
<value label="2">2</value>
<value label="4">4</value>
<value label="8">8</value>
<value label="16">16</value>
<value label="32">32</value>
<value label="64">64</value>
<value label="128">128</value>
<value label="Halve beatjump size">half</value>
<value label="Double beatjump size">double</value>
<description>The top left or pad button.</description>
</option>
<option
variable="beatJumpSize2"
type="enum"
label="Second Pad">
<value label="Use current beatjump size">beatjump</value>
<value label="1/32">0.03125</value>
<value label="1/16">0.0625</value>
<value label="1/8">0.125</value>
<value label="1/4">0.25</value>
<value label="1/2">0.5</value>
<value label="1">1</value>
<value label="2">2</value>
<value label="4" default="true">4</value>
<value label="8">8</value>
<value label="16">16</value>
<value label="32">32</value>
<value label="64">64</value>
<value label="128">128</value>
<value label="Halve beatjump size">half</value>
<value label="Double beatjump size">double</value>
<description>The top left second pad button.</description>
</option>
<option
variable="beatJumpSize3"
type="enum"
label="Third Pad">
<value label="Use current beatjump size">beatjump</value>
<value label="1/32">0.03125</value>
<value label="1/16">0.0625</value>
<value label="1/8">0.125</value>
<value label="1/4" default="true">0.25</value>
<value label="1/2">0.5</value>
<value label="1">1</value>
<value label="2">2</value>
<value label="4">4</value>
<value label="8" default="true">8</value>
<value label="16">16</value>
<value label="32">32</value>
<value label="64">64</value>
<value label="128">128</value>
<value label="Halve beatjump size">half</value>
<value label="Double beatjump size">double</value>
<description>The top right second pad button.</description>
</option>
<option
variable="beatJumpSize4"
type="enum"
label="Fourth Pad">
<value label="Use current beatjump size">beatjump</value>
<value label="1/32">0.03125</value>
<value label="1/16">0.0625</value>
<value label="1/8">0.125</value>
<value label="1/4">0.25</value>
<value label="1/2" default="true">0.5</value>
<value label="1">1</value>
<value label="2">2</value>
<value label="4">4</value>
<value label="8">8</value>
<value label="16" default="true">16</value>
<value label="32">32</value>
<value label="64">64</value>
<value label="128">128</value>
<value label="Halve beatjump size">half</value>
<value label="Double beatjump size">double</value>
<description>The top right pad button.</description>
</option>
</row>
<row orientation="vertical">
<option
variable="beatJumpSize5"
type="enum"
label="Fifth Pad">
<value label="Use current beatjump size">beatjump</value>
<value label="1/32">0.03125</value>
<value label="1/16">0.0625</value>
<value label="1/8">0.125</value>
<value label="1/4">0.25</value>
<value label="1/2">0.5</value>
<value label="1">1</value>
<value label="2">2</value>
<value label="4">4</value>
<value label="8">8</value>
<value label="16">16</value>
<value label="32" default="true">32</value>
<value label="64">64</value>
<value label="128">128</value>
<value label="Halve beatjump size">half</value>
<value label="Double beatjump size">double</value>
<description>The bottom left pad button.</description>
</option>
<option
variable="beatJumpSize6"
type="enum"
label="Sixth Pad">
<value label="Use current beatjump size">beatjump</value>
<value label="1/32">0.03125</value>
<value label="1/16">0.0625</value>
<value label="1/8">0.125</value>
<value label="1/4">0.25</value>
<value label="1/2">0.5</value>
<value label="1">1</value>
<value label="2" default="true">2</value>
<value label="4">4</value>
<value label="8">8</value>
<value label="16">16</value>
<value label="32">32</value>
<value label="64" default="true">64</value>
<value label="128">128</value>
<value label="Halve beatjump size">half</value>
<value label="Double beatjump size">double</value>
<description>The bottom left second pad button.</description>
</option>
<option
variable="beatJumpSize7"
type="enum"
label="Seventh Pad">
<value label="Use current beatjump size">half</value>
<value label="1/32">0.03125</value>
<value label="1/16">0.0625</value>
<value label="1/8">0.125</value>
<value label="1/4">0.25</value>
<value label="1/2">0.5</value>
<value label="1">1</value>
<value label="2">2</value>
<value label="4" >4</value>
<value label="8">8</value>
<value label="16">16</value>
<value label="32">32</value>
<value label="64">64</value>
<value label="128">128</value>
<value label="Halve beatjump size" default="true">half</value>
<value label="Double beatjump size">double</value>
<description>The bottom right second pad button.</description>
</option>
<option
variable="beatJumpSize8"
type="enum"
label="Eighth Pad">
<value label="Use current beatjump size">beatjump</value>
<value label="1/32">0.03125</value>
<value label="1/16">0.0625</value>
<value label="1/8">0.125</value>
<value label="1/4">0.25</value>
<value label="1/2">0.5</value>
<value label="1">1</value>
<value label="2">2</value>
<value label="4">4</value>
<value label="8">8</value>
<value label="16">16</value>
<value label="32">32</value>
<value label="64">64</value>
<value label="128">128</value>
<value label="Halve beatjump size">half</value>
<value label="Double beatjump size" default="true">double</value>
<description>The bottom right pad button.</description>
</option>
</row>
</group>
<group label="Library">
<row orientation="vertical">
<option
Expand Down Expand Up @@ -691,7 +873,7 @@
</row>
</group>
</settings>
<controller id="Traktor">
<controller id="Traktor" namespace="S4MK3">
<scriptfiles>
<file filename="Traktor-Kontrol-S4-MK3.js" functionprefix="TraktorS4MK3"/>
</scriptfiles>
Expand Down
Loading