turn `waveform_zoom` into ControlPotmeter #12387

ronso0 · 2023-12-02T17:35:58Z

c++ alternative to #12373

waveform_zoom is now a ControlPotmeter incl. _up, _down, _set_default and some rather useless controls
step size is 1, i.e. _up/_down act exactly as before
~~added waveform_zoom_selector, triggers _up/_down and thereby simplifies mapping rotary encoders with the SelectKnob MIDI option~~ already possible with the e.g. the Rot64 MIDI option
~~fixed some hard-coded ranges in mappings~~ controllers: fix waveform_zoom ranges #12393

TODO

update the manual update waveform_zoom, is now a ControlPotmeter manual#722

Note to myself:
pick 55418d0 from #12373

ronso0 · 2023-12-02T20:07:04Z

src/mixer/basetrackplayer.cpp

+                    ControlObject::set(ConfigKey(getGroup(), "waveform_zoom_" + dir), 1);
+                    ControlObject::set(ConfigKey(getGroup(), "waveform_zoom_" + dir), 0);


I'm not happy with this, but I couldn't make it work with ControlProxies.
I created them right after having created the ControlPotmeter and used them in the lambda, but setting the proxies would do nothing, and I have no idea why. No error or warning was thrown.

daschuer · 2024-02-21T22:09:42Z

A conflict has developed. What is the state here? Is still a draft?

ronso0 · 2024-02-22T12:14:00Z

Conflict is resolved.

I didn't test this yet with a controller myself.

ronso0 · 2024-02-23T11:13:09Z

It zooms pretty fast, so maybe there could be call to increase the number of zoom levels.

Which control did you map? (to what kind of input?)

waveform_zoom is for pots (continuous 0 -127)
waveform_zoom_selector is for encoders (-1, 0, 1 / 63, 64, 54), triggers _up and _down and should work exactly as before.

mxmilkiib · 2024-02-23T12:09:10Z

I assigned the new one to an encoder.

Previously, I assigned the old one to a pot and it didn't work, like you state here it should, this being my original confusion.

Past of my first message on the forum being; "I’m trying to assign “Waveform Zoom” (not “Waveform Zoom In” or “Waveform Zoom Out”) to a channel dial on a Kork nanoKontroller2, but it does nothing when I turn the dial after."

mxmilkiib · 2024-02-24T03:18:20Z

So it's highly likely I got part of an understanding/remembrance turned around once or twice.

I checked again earlier; the original works with a standard pot, the new one with a rotary encoder.

The pot has more granularity to the zoom and you can turn it for longer. The encoder only needs to rotate a rather small amount to go through all the zoom levels.

ronso0 · 2024-03-09T01:29:33Z

I checked again earlier; the original works with a standard pot, the new one with a rotary encoder.

Yes, the new "original one" (waveform_zoom) now works right away with a pot (required manual script implementation earlier).

I just tested both this and waveform_zoom_selector with the learning wizard with a pot and a rotary encoder and they work as expected.

mxmilkiib · 2024-04-03T09:51:43Z

critical [Controller] DEBUG ASSERT: "!"pBehavior == nullptr, abort setValueFromMidi()"" in function void ControlDoublePrivate::setValueFromMidi(MidiOpCode, double) at ./src/control/control.cpp:347
warning [Controller] Cannot get "[Channel1]" , "waveform_zoom" as Midi
critical [Controller] DEBUG ASSERT: "!"pBehavior == nullptr, getMidiParameter() is returning 0"" in function double ControlDoublePrivate::getMidiParameter() const at ./src/control/control.cpp:357
warning [Controller] Cannot set "[Channel1]" , "waveform_zoom" from Midi

ronso0 · 2024-04-07T18:05:17Z

critical [Controller] DEBUG ASSERT: "!"pBehavior == nullptr, abort setValueFromMidi()"" in function void ControlDoublePrivate::setValueFromMidi(MidiOpCode, double) at ./src/control/control.cpp:347
warning [Controller] Cannot get "[Channel1]" , "waveform_zoom" as Midi
critical [Controller] DEBUG ASSERT: "!"pBehavior == nullptr, getMidiParameter() is returning 0"" in function double ControlDoublePrivate::getMidiParameter() const at ./src/control/control.cpp:357
warning [Controller] Cannot set "[Channel1]" , "waveform_zoom" from Midi

How did you get these?

Ii just tested again with a clean mapping and all cotnrols work as expected: up, down, selector, pot

github-actions · 2024-07-07T00:09:07Z

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

mxmilkiib · 2025-01-30T16:28:52Z

This is the same Cannot get "[Channel1]" , "waveform_zoom" as Midi assertion crash as in #10136

ronso0 · 2025-01-30T22:13:10Z

Well, this branch is more than a year old so it has all the bugs of main back then.
I've just rebased this, please test again.

daschuer

For my understanding we don't need "waveform_zoom_selector". We have already the mapping options
We have the mapping options of "HercJog"/"HercJogFast"/"Rot64"/"Rot64Fast" for it.

ronso0 · 2025-02-01T00:41:08Z

Yup, that's right!
I simplified the actual potmeter commit.

I'd also pick 55418d0 from #12373, wdyt?

ronso0 · 2025-02-01T00:43:24Z

And actually this can go to 2.5 now that it's just a backend change of the existing control.
I think being able to map it to pots is an enhancement. Wdyt?

mxmilkiib · 2025-02-01T07:57:44Z

the only bump I'd like to mention is #6682, and that, where it does work, the zoom control will not zoom through the entire scale of a patched-to-have-a-larger-zoom-scale build

I don't know how that can potentially be future proofed for given any changes/adaptation here (and trickiness of implementing a scale range change). I understand that that might not be possible, though I'll continue to patch my zoom to allow a better overview of the relationship between song timelines

edit; I forgot that I think why it works on my nanokontrol2 is because of the controller script doing the magick

daschuer

LGTM, just a compiler warnig. Thank you.
Please amend, an than we can merge.

daschuer · 2025-02-01T13:45:00Z

src/preferences/dialog/dlgprefwaveform.cpp

@@ -559,6 +561,12 @@ void DlgPrefWaveform::slotSetWaveformOverviewType() {

 void DlgPrefWaveform::slotSetDefaultZoom(int index) {
    WaveformWidgetFactory::instance()->setDefaultZoom(index + 1);
+    for (int i = 1; i <= PlayerManager::numDecks(); i++) {


Suggested change

for (int i = 1; i <= PlayerManager::numDecks(); i++) {

for (unsigned int i = 1; i <= PlayerManager::numDecks(); i++) {

Yep, saw that. I've also included samplers update.

…potmeters

ronso0 · 2025-02-04T01:03:54Z

I fixed the build issue, but I also saw that the "zoom_set_default" buttons in Deere did not reset to the desired value.
Couldn't reproduce again, so please do some thorough tests incl. waveform preferences @mxmilkiib

github-actions bot added controller mappings skins ui preferences labels Dec 2, 2023

ronso0 force-pushed the waveform-zoom-controlpotmeter branch from 74131de to 52e59a6 Compare December 2, 2023 20:03

ronso0 commented Dec 2, 2023

View reviewed changes

ronso0 force-pushed the waveform-zoom-controlpotmeter branch from 52e59a6 to 9aa4a3b Compare December 2, 2023 20:08

ronso0 mentioned this pull request Dec 3, 2023

controllers: add helper to control "waveform_zoom" with potmeters #12373

Closed

2 tasks

ronso0 linked an issue Dec 4, 2023 that may be closed by this pull request

Add a beats_translate_move? Like beats_translate_earlier and beats_translate_later, but can be used with a single CC SelectKnob style bind #12337

Closed

ronso0 removed a link to an issue Dec 4, 2023

Add a beats_translate_move? Like beats_translate_earlier and beats_translate_later, but can be used with a single CC SelectKnob style bind #12337

Closed

ronso0 linked an issue Dec 4, 2023 that may be closed by this pull request

No way to directly (Wizard) map waveform_zoom to a controller pot yet #12251

Open

ronso0 mentioned this pull request Dec 4, 2023

No way to directly (Wizard) map waveform_zoom to a controller pot yet #12251

Open

ronso0 force-pushed the waveform-zoom-controlpotmeter branch from 9aa4a3b to 2378cb6 Compare December 4, 2023 15:32

github-actions bot removed the controller mappings label Dec 4, 2023

ronso0 mentioned this pull request Dec 4, 2023

controllers: fix waveform_zoom ranges #12393

Merged

mxmilkiib mentioned this pull request Dec 6, 2023

MIDI learn should support a single knob for opposing functions (e.g. track select) #7557

Open

ronso0 force-pushed the waveform-zoom-controlpotmeter branch from 2378cb6 to 4dc8d5c Compare February 22, 2024 11:51

ronso0 mentioned this pull request Feb 23, 2024

Extend waveform zoom range #6682

Open

Swiftb0y mentioned this pull request Mar 1, 2024

uniform waveform zoom CO regardless of preferences. #12899

Open

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

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

ronso0 force-pushed the waveform-zoom-controlpotmeter branch from 4dc8d5c to c2e79cc Compare January 30, 2025 22:12

github-actions bot added the controller backend label Jan 30, 2025

ronso0 force-pushed the waveform-zoom-controlpotmeter branch from c2e79cc to 33da9cd Compare January 30, 2025 22:19

daschuer requested changes Jan 31, 2025

View reviewed changes

make waveform_zoom a ControlPotmeter to simplify mapping to potmeters

f0542c0

ronso0 mentioned this pull request Feb 1, 2025

update waveform_zoom, is now a ControlPotmeter mixxxdj/manual#722

Open

ronso0 force-pushed the waveform-zoom-controlpotmeter branch from 33da9cd to f0542c0 Compare February 1, 2025 00:48

daschuer requested changes Feb 1, 2025

View reviewed changes

fixup! make waveform_zoom a ControlPotmeter to simplify mapping to …

b8c4723

…potmeters

ronso0 force-pushed the waveform-zoom-controlpotmeter branch from 4e068f4 to b8c4723 Compare February 4, 2025 01:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

turn `waveform_zoom` into ControlPotmeter #12387

turn `waveform_zoom` into ControlPotmeter #12387

ronso0 commented Dec 2, 2023 •

edited

Loading

ronso0 Dec 2, 2023

daschuer commented Feb 21, 2024

ronso0 commented Feb 22, 2024

ronso0 commented Feb 23, 2024

mxmilkiib commented Feb 23, 2024

mxmilkiib commented Feb 24, 2024 •

edited

Loading

ronso0 commented Mar 9, 2024 •

edited

Loading

mxmilkiib commented Apr 3, 2024

ronso0 commented Apr 7, 2024

github-actions bot commented Jul 7, 2024

mxmilkiib commented Jan 30, 2025

ronso0 commented Jan 30, 2025

daschuer left a comment

ronso0 commented Feb 1, 2025

ronso0 commented Feb 1, 2025

mxmilkiib commented Feb 1, 2025 •

edited

Loading

daschuer left a comment

daschuer Feb 1, 2025

ronso0 Feb 1, 2025

ronso0 commented Feb 4, 2025

		ControlObject::set(ConfigKey(getGroup(), "waveform_zoom_" + dir), 1);
		ControlObject::set(ConfigKey(getGroup(), "waveform_zoom_" + dir), 0);

	for (int i = 1; i <= PlayerManager::numDecks(); i++) {
	for (unsigned int i = 1; i <= PlayerManager::numDecks(); i++) {

turn waveform_zoom into ControlPotmeter #12387

Are you sure you want to change the base?

turn waveform_zoom into ControlPotmeter #12387

Conversation

ronso0 commented Dec 2, 2023 • edited Loading

ronso0 Dec 2, 2023

Choose a reason for hiding this comment

daschuer commented Feb 21, 2024

ronso0 commented Feb 22, 2024

ronso0 commented Feb 23, 2024

mxmilkiib commented Feb 23, 2024

mxmilkiib commented Feb 24, 2024 • edited Loading

ronso0 commented Mar 9, 2024 • edited Loading

mxmilkiib commented Apr 3, 2024

ronso0 commented Apr 7, 2024

github-actions bot commented Jul 7, 2024

mxmilkiib commented Jan 30, 2025

ronso0 commented Jan 30, 2025

daschuer left a comment

Choose a reason for hiding this comment

ronso0 commented Feb 1, 2025

ronso0 commented Feb 1, 2025

mxmilkiib commented Feb 1, 2025 • edited Loading

daschuer left a comment

Choose a reason for hiding this comment

daschuer Feb 1, 2025

Choose a reason for hiding this comment

ronso0 Feb 1, 2025

Choose a reason for hiding this comment

ronso0 commented Feb 4, 2025

turn `waveform_zoom` into ControlPotmeter #12387

turn `waveform_zoom` into ControlPotmeter #12387

ronso0 commented Dec 2, 2023 •

edited

Loading

mxmilkiib commented Feb 24, 2024 •

edited

Loading

ronso0 commented Mar 9, 2024 •

edited

Loading

mxmilkiib commented Feb 1, 2025 •

edited

Loading