CO Renaming (Pt. 6): Mixer Controls [WIP] #12023

Holzhaus · 2023-09-24T22:07:30Z

Part of #11931.

Based on #12021 and #12022.

github-actions · 2024-01-06T00:07:12Z

This PR is marked as stale because it has been open 90 days with no activity.

daschuer · 2024-01-06T09:27:18Z

What is the state of this PR? Is it still a 2.4 candidate?

ywwg · 2024-01-08T00:37:02Z

CO renaming has been causing regressions in controller configs so I would prefer to bump this to 2.4.1 or 2.5

daschuer · 2024-01-08T05:57:33Z

Than it is 2.5, because 2.4.1 is a bugfix release.

ronso0 · 2024-02-18T23:14:44Z

I removed the draft state since dependencies have been merged.

github-actions · 2024-08-10T00:08:30Z

This PR is marked as stale because it has been open 90 days with no activity.

Holzhaus · 2024-12-06T21:05:02Z

@ronso0 do you have interest to take over? I'm not sure when I'd get to it.

ronso0 · 2024-12-07T14:05:11Z

Hmm yeah, can do that.
So essentially rebase onto main, fix the conflicts and change the remaining controls ins /res?

Holzhaus · 2024-12-08T10:39:33Z

I think so. Maybe check with git grep someterm if some occurence of a term was missed.

github-actions · 2025-11-08T00:10:46Z

This PR is marked as stale because it has been open 90 days with no activity.

ronso0 · 2025-11-08T16:09:44Z

I've moved it to the 2.5.4 milestone.

I'll take a look next week. Rebase onto 2.6, resolve conflicts.
Or move to 2.7 @mixxxdj/developers ?

ronso0 · 2025-11-13T12:46:21Z

res/controllers/Electrix-Tweaker-scripts.js

-        "headVolume": "ElectrixTweaker.headGainLEDs",
-        "headMix": "ElectrixTweaker.headMixLEDs",
-        "headSplit": "ElectrixTweaker.headSplitLED"
+        "headphone_gain": "ElectrixTweaker.headphone_gainLEDs",


let's revert this one

(starting to review and leave some notes for myself)

ronso0 · 2025-11-13T12:48:57Z

res/controllers/Hercules-DJ-Console-4-Mx-scripts.js

 // --- Personal preferences configuration ---
 Hercules4Mx.userSettings = {
-    // Indicates if the Headphone/Master mix should automatically be set to master when none of the headphone cue buttons are activated.
+    // Indicates if the Headphone/Main mix should automatically be set to master when none of the headphone cue buttons are activated.


Suggested change

// Indicates if the Headphone/Main mix should automatically be set to master when none of the headphone cue buttons are activated.

// Indicates if the Headphone/Main mix should automatically be set to main when none of the headphone cue buttons are activated.

ronso0 · 2025-11-13T12:50:50Z

res/controllers/Hercules-DJ-Console-4-Mx-scripts.js

    'vu1': 0x39,
    // Which source to use for this vumeter. [Disabled] for no source
-    'source': '[Master]',
+    'source': '[Mixer]',


here and above:

Suggested change

'source': '[Mixer]',

'source': '[Main]',

double-check!

ah okay, it's a string comparison in
Hercules4Mx.onVuMeterMainL
Hercules4Mx.onVuMeterMainR

so (should) work as is, though [Main] makes more sense

ronso0 · 2025-11-13T12:57:53Z

res/controllers/Hercules-DJ-Console-RMX-hid-scripts.js

+  c.add_control(pid, "balance",           "[Mixer]",   "fader", 15, 0xff);
+  c.add_control(pid, "volume",            "[Mixer]",   "fader", 16, 0xff);
+  c.add_control(pid, "crossfader",        "[Mixer]",   "fader", 17, 0xff);
+  c.add_control(pid, "headphone_mix",           "[Mixer]",   "fader", 18, 0xff);


Suggested change

c.add_control(pid, "headphone_mix", "[Mixer]", "fader", 18, 0xff);

c.add_control(pid, "headphone_mix", "[Mixer]", "fader", 18, 0xff);

nit

ronso0 · 2025-11-13T13:02:15Z

res/controllers/Korg-nanoKONTROL-2-scripts.js

+NK2.Controls[NK2.Knob[2]]["N"][NK2.MODcodes["0000"]]={"isset":true, "pressEval":'NK2.logKnobAdjust("[Mixer]", "headphone_gain", value, 0, 5);', "LEDstateType":"off"};
+NK2.Controls[NK2.Knob[3]]["N"][NK2.MODcodes["0000"]]={"isset":true, "pressEval":'NK2.knobAdjust("[Mixer]", "headphone_mix", value, -1, 1);', "LEDstateType":"off"};
+NK2.Controls[NK2.Knob[4]]["N"][NK2.MODcodes["0000"]]={"isset":true, "pressEval":'NK2.knobAdjust("[Mixer]", "balance", value, -1, 1);', "LEDstateType":"off"};
+NK2.Controls[NK2.Knob[5]]["N"][NK2.MODcodes["0000"]]={"isset":true, "pressEval":'NK2.logKnobAdjust("[Mixer]", "volume", value, 0, 5);', "LEDstateType":"off"};


ronso0 · 2025-11-13T13:02:30Z

res/controllers/Korg-nanoKONTROL-2-scripts.js

+NK2.Controls[NK2.Sbutton[1]]["N"][NK2.MODcodes["0011"]]={"isset":true, "pressEval":false, "releaseEval":false, "LEDstateType":"hook", "LEDhookControl":'VuMeterL', "LEDhookFunction":'NK2.vuMeterL', "LEDhookGroup":"[Mixer]"};
+NK2.Controls[NK2.Mbutton[1]]["N"][NK2.MODcodes["0011"]]={"isset":true, "pressEval":'NK2.binControlPress("'+NK2.Deck[1]+'", "bpm_tap");', "releaseEval":false, "LEDstateType":"hook", "LEDhookControl":'VuMeterR', "LEDhookFunction":'NK2.vuMeterR', "LEDhookGroup":"[Mixer]"};


ronso0 · 2025-11-13T13:11:30Z

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

+            engine.setValue("[Master]", "headphone_mix", 0);
        } else {
            // 100% master
            // Check if 1 is all master or all cue
-            engine.setValue("[Master]", "headMix", 1);
+            engine.setValue("[Master]", "headphone_mix", 1);
        }
    } else {
        // 0% master
        // Check if 1 is all master or all cue
-        engine.setValue("[Master]", "headMix", -1);
+        engine.setValue("[Master]", "headphone_mix", -1);


Suggested change

engine.setValue("[Master]", "headphone_mix", 0);

} else {

// 100% master

// Check if 1 is all master or all cue

engine.setValue("[Master]", "headMix", 1);

engine.setValue("[Master]", "headphone_mix", 1);

}

} else {

// 0% master

// Check if 1 is all master or all cue

engine.setValue("[Master]", "headMix", -1);

engine.setValue("[Master]", "headphone_mix", -1);

engine.setValue("[Mixer]", "headphone_mix", 0);

} else {

// 100% master

// Check if 1 is all master or all cue

engine.setValue("[Mixer]", "headphone_mix", 1);

}

} else {

// 0% master

// Check if 1 is all master or all cue

engine.setValue("[Mixer]", "headphone_mix", -1);

ronso0 · 2025-11-13T17:16:31Z

Rebased in #15603

Holzhaus added the control objects Issues and bugs specifically in regard to mixxx `ControlObjects` label Sep 24, 2023

Holzhaus added this to the 2.4.0 milestone Sep 24, 2023

Holzhaus changed the title ~~CO Renaming (Pt. 6): Mixer Controls~~ CO Renaming (Pt. 6): Mixer Controls [WIP] Sep 24, 2023

github-actions bot added code quality controller mappings skins ui labels Sep 24, 2023

Holzhaus force-pushed the mixer-controls-pt2 branch from a090d27 to ed7c228 Compare September 29, 2023 14:30

github-actions bot added the library label Sep 29, 2023

Holzhaus force-pushed the mixer-controls-pt2 branch from ed7c228 to e0f871f Compare September 29, 2023 15:33

Holzhaus added 7 commits October 7, 2023 13:51

chore(enginemixer): Move main gain alias near object constructor

6df2cb9

feat(enginetalkoverducking): Add support for adding aliases

fabb0db

chore(enginemixer): Use kLegacyGroup where applicable

2f2542c

refactor(enginemixer): Rename controls and move to [Mixer] group

a2bd157

test(controlobjectaliastest): Add tests for mixer aliases

2665c98

chore(dlgprefsound): Use renamed mixer controls

32bf30a

chore: Use new mixer controls in C++ code

1b4c886

Holzhaus force-pushed the mixer-controls-pt2 branch 2 times, most recently from 1afecfb to 1ee18ec Compare October 7, 2023 23:38

chore: Use new controls in mappings and skins [WIP]

15afcb4

Holzhaus force-pushed the mixer-controls-pt2 branch from 1ee18ec to 15afcb4 Compare October 7, 2023 23:39

github-actions bot added the stale Stale issues that haven't been updated for a long time. label Jan 6, 2024

github-actions bot removed the stale Stale issues that haven't been updated for a long time. label Jan 7, 2024

ronso0 modified the milestones: 2.4.0, 2.5.0 Jan 8, 2024

daschuer added this to the 2.6-beta milestone May 8, 2024

github-actions bot added the stale Stale issues that haven't been updated for a long time. label Aug 10, 2024

github-actions bot removed the stale Stale issues that haven't been updated for a long time. label Dec 8, 2024

daschuer changed the base branch from 2.4 to 2.5 January 25, 2025 22:30

acolombier added this to Releases Mar 25, 2025

github-project-automation bot moved this to In progress in Releases Mar 25, 2025

daschuer removed this from the 2.6-beta milestone Apr 25, 2025

daschuer force-pushed the 2.5 branch from d0d7738 to 0e2e43d Compare April 27, 2025 01:24

acolombier force-pushed the 2.5 branch 2 times, most recently from cd725b1 to d7d5934 Compare June 20, 2025 18:01

github-actions bot added the stale Stale issues that haven't been updated for a long time. label Nov 8, 2025

ronso0 removed the stale Stale issues that haven't been updated for a long time. label Nov 8, 2025

ronso0 added this to the 2.6.0 milestone Nov 8, 2025

ronso0 reviewed Nov 13, 2025

View reviewed changes

ronso0 mentioned this pull request Nov 13, 2025

Mixer controls pt2 #15603

Draft

ronso0 modified the milestones: 2.6.0, 2.7-beta Nov 26, 2025

	// Indicates if the Headphone/Main mix should automatically be set to master when none of the headphone cue buttons are activated.
	// Indicates if the Headphone/Main mix should automatically be set to main when none of the headphone cue buttons are activated.

	c.add_control(pid, "headphone_mix", "[Mixer]", "fader", 18, 0xff);
	c.add_control(pid, "headphone_mix", "[Mixer]", "fader", 18, 0xff);

		NK2.Controls[NK2.Sbutton[1]]["N"][NK2.MODcodes["0011"]]={"isset":true, "pressEval":false, "releaseEval":false, "LEDstateType":"hook", "LEDhookControl":'VuMeterL', "LEDhookFunction":'NK2.vuMeterL', "LEDhookGroup":"[Mixer]"};
		NK2.Controls[NK2.Mbutton[1]]["N"][NK2.MODcodes["0011"]]={"isset":true, "pressEval":'NK2.binControlPress("'+NK2.Deck[1]+'", "bpm_tap");', "releaseEval":false, "LEDstateType":"hook", "LEDhookControl":'VuMeterR', "LEDhookFunction":'NK2.vuMeterR', "LEDhookGroup":"[Mixer]"};

Uh oh!

CO Renaming (Pt. 6): Mixer Controls [WIP] #12023

Are you sure you want to change the base?

CO Renaming (Pt. 6): Mixer Controls [WIP] #12023

Uh oh!

Conversation

Holzhaus commented Sep 24, 2023

Uh oh!

github-actions bot commented Jan 6, 2024

Uh oh!

daschuer commented Jan 6, 2024

Uh oh!

ywwg commented Jan 8, 2024

Uh oh!

daschuer commented Jan 8, 2024

Uh oh!

ronso0 commented Feb 18, 2024

Uh oh!

github-actions bot commented Aug 10, 2024

Uh oh!

Holzhaus commented Dec 6, 2024

Uh oh!

ronso0 commented Dec 7, 2024

Uh oh!

Holzhaus commented Dec 8, 2024

Uh oh!

github-actions bot commented Nov 8, 2025

Uh oh!

ronso0 commented Nov 8, 2025

Uh oh!

ronso0 Nov 13, 2025

Choose a reason for hiding this comment

Uh oh!

ronso0 Nov 13, 2025

Choose a reason for hiding this comment

Uh oh!

ronso0 Nov 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ronso0 Nov 13, 2025

Choose a reason for hiding this comment

Uh oh!

ronso0 Nov 13, 2025

Choose a reason for hiding this comment

Uh oh!

ronso0 Nov 13, 2025

Choose a reason for hiding this comment

Uh oh!

ronso0 Nov 13, 2025

Choose a reason for hiding this comment

Uh oh!

ronso0 Nov 13, 2025

Choose a reason for hiding this comment

Uh oh!

ronso0 commented Nov 13, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ronso0 Nov 13, 2025 •

edited

Loading