Skip to content

Commit af7bce1

Browse files
sadko4usadko4u
committed
Moved Dry, Wet and Dry/Wet knobs into separate Mix Overlay
1 parent 21c6fca commit af7bce1

6 files changed

Lines changed: 62 additions & 37 deletions

File tree

‎CHANGELOG‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
=== 1.0.29 ===
66
* Optimized code for updated implementation of dspu::MeterGraph.
7+
* Moved Dry, Wet and Dry/Wet knobs into separate Mix Overlay.
78

89
=== 1.0.28 ===
910
* Updated build scripts and dependencies.

‎res/main/ui/trigger/single/mono.xml‎

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
<hbox spacing="8">
101101
<button id="pause" text="labels.pause" size="16" ui:inject="Button_green" led="true"/>
102102
<button id="clear" text="labels.clear" size="16" ui:inject="Button_red" led="true"/>
103+
<button ui:id="mix_trigger" id="showmx" text="labels.mix" size="22" pad.v="4"/>
103104
</hbox>
104105
</align>
105106
</hbox>
@@ -422,31 +423,39 @@
422423
</group>
423424

424425
<group text="groups.audio_channel" ipadding="0">
425-
<grid rows="3" cols="6">
426-
<ui:with padding="6">
427-
<label text="labels.signal.dry"/>
428-
<label text="labels.signal.wet"/>
429-
</ui:with>
430-
431-
<cell rows="3"><vsep hreduce="true" pad.h="2"/></cell>
432-
<label text="labels.signal.drywet" padding="6"/>
433-
<cell rows="3"><vsep hreduce="true" pad.h="2"/></cell>
434-
426+
<grid rows="3" cols="1">
435427
<ui:with padding="6">
436428
<label text="labels.output"/>
437-
438-
<knob id="dry" scolor="dry"/>
439-
<knob id="wet" scolor="wet"/>
440-
<knob id="drywet" scolor="drywet"/>
441429
<knob id="g_out"/>
442-
443-
<value id="dry"/>
444-
<value id="wet"/>
445-
<value id="drywet"/>
446430
<value id="g_out"/>
447431
</ui:with>
448432
</grid>
449433
</group>
450434
</hbox>
451435
</vbox>
436+
437+
<!-- Mix overlay -->
438+
<overlay id="showmx" trigger="mix_trigger" hpos="1" vpos="1" halign="-1" valign="1" ipadding.t="4">
439+
<group text="groups.mix" vexpand="false" ipadding="0">
440+
<grid rows="3" cols="4">
441+
<ui:with padding="6">
442+
<label text="labels.signal.dry"/>
443+
<label text="labels.signal.wet"/>
444+
</ui:with>
445+
446+
<cell rows="3"><vsep hreduce="true" pad.h="2"/></cell>
447+
<label text="labels.signal.drywet" padding="6"/>
448+
449+
<ui:with padding="6">
450+
<knob id="dry" scolor="dry"/>
451+
<knob id="wet" scolor="wet"/>
452+
<knob id="drywet" scolor="drywet"/>
453+
454+
<value id="dry"/>
455+
<value id="wet"/>
456+
<value id="drywet"/>
457+
</ui:with>
458+
</grid>
459+
</group>
460+
</overlay>
452461
</plugin>

‎res/main/ui/trigger/single/stereo.xml‎

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
<hbox spacing="8">
102102
<button id="pause" text="labels.pause" size="16" ui:inject="Button_green" led="true"/>
103103
<button id="clear" text="labels.clear" size="16" ui:inject="Button_red" led="true"/>
104+
<button ui:id="mix_trigger" id="showmx" text="labels.mix" size="22" pad.v="4"/>
104105
</hbox>
105106
</align>
106107
</hbox>
@@ -432,31 +433,39 @@
432433
</group>
433434

434435
<group text="groups.audio_channel" ipadding="0">
435-
<grid rows="3" cols="6">
436-
<ui:with padding="6">
437-
<label text="labels.signal.dry"/>
438-
<label text="labels.signal.wet"/>
439-
</ui:with>
440-
441-
<cell rows="3"><vsep hreduce="true" pad.h="2"/></cell>
442-
<label text="labels.signal.drywet" padding="6"/>
443-
<cell rows="3"><vsep hreduce="true" pad.h="2"/></cell>
444-
436+
<grid rows="3" cols="1">
445437
<ui:with padding="6">
446438
<label text="labels.output"/>
447-
448-
<knob id="dry" scolor="dry"/>
449-
<knob id="wet" scolor="wet"/>
450-
<knob id="drywet" scolor="drywet"/>
451439
<knob id="g_out"/>
452-
453-
<value id="dry"/>
454-
<value id="wet"/>
455-
<value id="drywet"/>
456440
<value id="g_out"/>
457441
</ui:with>
458442
</grid>
459443
</group>
460444
</hbox>
461445
</vbox>
446+
447+
<!-- Mix overlay -->
448+
<overlay id="showmx" trigger="mix_trigger" hpos="1" vpos="1" halign="-1" valign="1" ipadding.t="4">
449+
<group text="groups.mix" vexpand="false" ipadding="0">
450+
<grid rows="3" cols="4">
451+
<ui:with padding="6">
452+
<label text="labels.signal.dry"/>
453+
<label text="labels.signal.wet"/>
454+
</ui:with>
455+
456+
<cell rows="3"><vsep hreduce="true" pad.h="2"/></cell>
457+
<label text="labels.signal.drywet" padding="6"/>
458+
459+
<ui:with padding="6">
460+
<knob id="dry" scolor="dry"/>
461+
<knob id="wet" scolor="wet"/>
462+
<knob id="drywet" scolor="drywet"/>
463+
464+
<value id="dry"/>
465+
<value id="wet"/>
466+
<value id="drywet"/>
467+
</ui:with>
468+
</grid>
469+
</group>
470+
</overlay>
462471
</plugin>

‎src/doc/manuals/plugins/trigger.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<li><b>Workspace</b> - this control allows to switch the UI between trigger mode and instrument configuration mode.</li>
1919
<li><b>Pause</b> - pauses any updates of the trigger graph.</li>
2020
<li><b>Clear</b> - clears all graphs.</li>
21+
<li><b>Mix</b> - show dry/wet mix control overlay.</li>
2122
<?php if ($midi) {?>
2223
<li><b>Channel</b> - the MIDI channel to use for MIDI note.</li>
2324
<li><b>Note</b> - the note and the octave of the MIDI note generated by the trigger.</li>
@@ -84,9 +85,12 @@
8485
<li><b>Note on</b> - indicates that the playback event of the corresponding sample has triggered.</li>
8586
</ul>
8687
<p><b>'Audio channel' section:</b></p>
88+
<ul>
89+
<li><b>Output gain</b> - the overall output gain of the plugin.</li>
90+
</ul>
91+
<p><b>'Dry/Wet' mix control overlay:</b></p>
8792
<ul>
8893
<li><b>Dry</b> - the gain of the input signal passed to the audio inputs of the plugin.</li>
8994
<li><b>Wet</b> - the gain of the processed signal.</li>
9095
<li><b>Dry/Wet</b> - the knob that controls the balance between the mixed dry and wet signal (see <b>Dry</b> and <b>Wet</b>) and the dry (unprocessed) signal.</li>
91-
<li><b>Output gain</b> - the overall output gain of the plugin.</li>
9296
</ul>

‎src/main/meta/trigger.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ namespace lsp
136136
WET_GAIN(1.0f), \
137137
DRYWET(100.0f), \
138138
OUT_GAIN, \
139+
SWITCH("showmx", "Show mix overlay", "Show mix bar", 0.0f), \
139140
COMBO("mode", "Detection mode", "Mode", trigger_metadata::MODE_DFL, trigger_modes), \
140141
SWITCH("pause", "Pause graph analysis", "Pause", 0.0f), \
141142
TRIGGER("clear", "Clear graph analysis", "Clear"), \

‎src/main/plug/trigger.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ namespace lsp
314314
BIND_PORT(pWet);
315315
BIND_PORT(pDryWet);
316316
BIND_PORT(pGain);
317+
SKIP_PORT("Show Dry/Wet mix");
317318

318319
lsp_trace("Binding mode port...");
319320
BIND_PORT(pMode);

0 commit comments

Comments
 (0)