Skip to content
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

Jump to bottom

S4MK3: Software mixer support and default pad layout customisation #13059

Merged
merged 5 commits into from
May 13, 2024
Merged

S4MK3: Software mixer support and default pad layout customisation #13059

merged 5 commits into from
May 13, 2024

Conversation

acolombier
Copy link
Member

This addresses two feature requested raised on Zulip

UI change:

Before:
image

After:
image

acolombier
acolombier commented Apr 6, 2024
View reviewed changes
res/controllers/Traktor Kontrol S4 MK3.hid.xml Outdated
default="false"
label="Main gain is handled by the Mixxx built-in mixer">
<description>
When enable, the master potentiometer on top right column of the mixer will drive the main gain of the Mixxx internal mixer as well as the hardware built-in mixer in the device. This is useful if you aren't relying on the hardware output, but will create conflict if enabled when using the hardware outputs.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if the word master is problematic here - the device is physically labelled with Master so if it is, perhaps I can put " around it or the :hwbtn: marker?

@acolombier
Copy link
Member Author

Really annoying that the pre-commit don't seem to catch the required changes locally (same version, running the same command than the CI), but I guess eslint being in Javascript, it is expected to have an unexpected and random behaviour depending of the weather outside 😅

@acolombier acolombier mentioned this pull request Apr 7, 2024
Merged
@acolombier
Copy link
Member Author

Merge?

Swiftb0y
Swiftb0y reviewed Apr 12, 2024
View reviewed changes
res/controllers/Traktor Kontrol S4 MK3.hid.xml Outdated Show resolved Hide resolved
res/controllers/Traktor Kontrol S4 MK3.hid.xml Outdated Show resolved Hide resolved
res/controllers/Traktor Kontrol S4 MK3.hid.xml Outdated Show resolved Hide resolved
ywwg
ywwg approved these changes May 1, 2024
View reviewed changes
Copy link
Member

@ywwg ywwg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small suggestion for wording, otherwise looks good

res/controllers/Traktor Kontrol S4 MK3.hid.xml Outdated Show resolved Hide resolved
res/controllers/Traktor Kontrol S4 MK3.hid.xml Outdated Show resolved Hide resolved
res/controllers/Traktor Kontrol S4 MK3.hid.xml Outdated Show resolved Hide resolved
@acolombier
Copy link
Member Author

As the manual PR has been merged now, are we happy to merge this one too?

@acolombier
Copy link
Member Author

Can someone from the Core Team add the 2.5 milestone on this PR? The manual for this was merged so that will have to go with it (or need revert on manual)

@ywwg ywwg modified the milestones: 2.5-beta, 2.5.0 May 10, 2024
@ywwg
Copy link
Member

ywwg commented May 10, 2024

I should be able to quickly test this on my hardware and merge today if it's good

@daschuer daschuer merged commit db3b5c9 into mixxxdj:main May 13, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ywwg ywwg ywwg approved these changes

@Swiftb0y Swiftb0y Awaiting requested review from Swiftb0y

Assignees
No one assigned
Labels
controllers
Projects
None yet
Milestone
2.5-beta
Development

Successfully merging this pull request may close these issues.
4 participants
@acolombier @ywwg @Swiftb0y @daschuer