[SCM] calf/master: more cleanup in monosynth UI knob3 reworked (black ring)
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:40:44 UTC 2013
The following commit has been merged in the master branch:
commit dd8c286431eb4faf8fb5d72a64d6b9d1a86a7f3d
Author: Markus Schmidt <schmidt at boomshop.net>
Date: Sat Dec 10 06:14:07 2011 +0100
more cleanup in monosynth UI
knob3 reworked (black ring)
diff --git a/gui/gui-monosynth.xml b/gui/gui-monosynth.xml
index 4b23c09..30f5bd8 100644
--- a/gui/gui-monosynth.xml
+++ b/gui/gui-monosynth.xml
@@ -33,21 +33,17 @@
<vbox spacing="3">
<frame label="Oscillator 1">
<hbox spacing="3">
- <vbox>
- <label/>
- <label param="o1_wave" text="Waveform"/>
- <combo param="o1_wave" fill="0"/>
- <label/>
- <label/>
+ <vbox>
+ <combo param="o1_wave" fill="0" expand="0"/>
+ <if cond="directlink">
+ <line-graph param="o1_wave" refresh="1" width="150" height="70" expand="1" fill="1"/>
+ </if>
</vbox>
<vbox>
<label attach-x="1" attach-y="0" param="o1_pw" text="Pulse Width"/>
<knob attach-x="1" attach-y="1" param="o1_pw"/>
<value attach-x="1" attach-y="2" param="o1_pw"/>
</vbox>
- <if cond="directlink">
- <line-graph param="o1_wave" refresh="1" width="70" height="70" expand="0" fill="0"/>
- </if>
<vbox>
<label param="o1_stretch" text="Stretch"/>
<knob param="o1_stretch"/>
@@ -63,54 +59,48 @@
<frame label="Oscillator 2">
<hbox spacing="3">
<vbox>
- <label/>
- <label param="o2_wave" text="Waveform"/>
- <combo param="o2_wave" fill="0"/>
- <label/>
- <label/>
+ <combo param="o2_wave" fill="0" expand="0"/>
+ <if cond="directlink">
+ <line-graph param="o2_wave" refresh="1" width="150" height="70" expand="1" fill="1"/>
+ </if>
</vbox>
+ <label />
<vbox>
<label attach-x="1" attach-y="0" param="o2_pw" text="Pulse Width"/>
<knob attach-x="1" attach-y="1" param="o2_pw"/>
<value attach-x="1" attach-y="2" param="o2_pw"/>
</vbox>
- <if cond="directlink">
- <line-graph param="o2_wave" refresh="1" width="70" height="70" expand="0" fill="0"/>
- </if>
+ <label />
<vbox>
<label param="o2_xpose" text="Transpose"/>
<knob type="1" param="o2_xpose"/>
<value param="o2_xpose"/>
</vbox>
- <label text=" " />
+ <label />
</hbox>
</frame>
</vbox>
<frame label="Oscillators - Common">
<vbox>
- <label/>
+ <vbox>
+ <label param="o12_mix" expand="0" fill="0"/>
+ <hscale param="o12_mix" position="bottom" expand="1" fill="1"/>
+ </vbox>
<hbox>
<vbox>
<label param="o12_detune"/>
- <knob param="o12_detune"/>
+ <knob param="o12_detune" size="3"/>
<value param="o12_detune"/>
</vbox>
<vbox>
<label param="scale_detune"/>
- <knob param="scale_detune"/>
+ <knob param="scale_detune" size="3"/>
<value param="scale_detune"/>
</vbox>
</hbox>
- <vbox >
- <label param="o12_mix" expand="0" fill="0"/>
- <hscale param="o12_mix" position="bottom" expand="1" fill="1"/>
- </vbox>
<vbox>
- <label/>
<label param="phase_mode" />
<combo param="phase_mode" fill="0" expand="0"/>
- <label/>
- <label />
</vbox>
</vbox>
</frame>
@@ -119,36 +109,36 @@
<frame label="Filter">
<hbox spacing="3">
<vbox>
- <label/>
- <label param="filter" fill="0" expand="0"/>
<combo param="filter" fill="0" expand="0"/>
- <label/>
- <label/>
+ <if cond="directlink">
+ <line-graph param="filter" refresh="1" width="150" height="70" expand="1" fill="1"/>
+ </if>
</vbox>
- <label text=""/>
- <if cond="directlink">
- <line-graph param="filter" refresh="1" width="70" height="70" expand="0" fill="0"/>
- </if>
+ <label />
<vbox>
<label param="cutoff"/>
- <knob param="cutoff"/>
+ <knob param="cutoff" size="2"/>
<value param="cutoff"/>
</vbox>
+ <label />
<vbox>
<label param="res"/>
- <knob param="res"/>
+ <knob param="res" size="2"/>
<value param="res"/>
</vbox>
+ <label text=" "/>
<vbox>
<label param="filter_sep"/>
- <knob type="1" param="filter_sep"/>
+ <knob type="1" param="filter_sep" size="3"/>
<value param="filter_sep"/>
</vbox>
+ <label text=" "/>
<vbox>
<label param="key_follow"/>
- <knob param="key_follow"/>
+ <knob param="key_follow" size="3"/>
<value param="key_follow"/>
</vbox>
+ <label/>
</hbox>
</frame>
</hbox>
diff --git a/gui/knob3.png b/gui/knob3.png
index 0041472..6cf880f 100644
Binary files a/gui/knob3.png and b/gui/knob3.png differ
diff --git a/knobs/knob3.png b/knobs/knob3.png
index 0041472..6cf880f 100644
Binary files a/knobs/knob3.png and b/knobs/knob3.png differ
diff --git a/knobs/knob3.py b/knobs/knob3.py
index a55af0e..2aebbad 100755
--- a/knobs/knob3.py
+++ b/knobs/knob3.py
@@ -94,7 +94,7 @@ for variant in range(0, 4):
if variant == 2: lit = pvalue == 0 or pvalue < lvalue
if not lit:
if not glowlit:
- ctx.set_source_rgb(0.0, 0.1, 0.1)
+ ctx.set_source_rgba(0.0, 0.1, 0.2, 0.6)
else:
ctx.set_source_rgb(0.0 * glowval, 0.75 * glowval, 1.0 * glowval)
else:
diff --git a/knobs/knob3_bg.png b/knobs/knob3_bg.png
index ad03815..1671711 100644
Binary files a/knobs/knob3_bg.png and b/knobs/knob3_bg.png differ
diff --git a/src/metadata.cpp b/src/metadata.cpp
index d26c64d..e4a3ace 100644
--- a/src/metadata.cpp
+++ b/src/metadata.cpp
@@ -563,13 +563,13 @@ CALF_PORT_PROPS(multibandlimiter) = {
{ 0.2f, -1.f, 1.f, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_GRAPH, NULL, "weight0", "Weight 1" },
{ -0.2f, -1.f, 1.f, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_GRAPH, NULL, "weight1", "Weight 2" },
- { 0.1f, -1.f, 1.f, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_GRAPH, NULL, "weight2", "Weight 3" },
- { 0.f, -1.f, 1.f, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_GRAPH, NULL, "weight3", "Weight 4" },
+ { 0.2f, -1.f, 1.f, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_GRAPH, NULL, "weight2", "Weight 3" },
+ { -0.2f, -1.f, 1.f, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_GRAPH, NULL, "weight3", "Weight 4" },
- { 0.4f, -1.f, 1.f, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_GRAPH, NULL, "release0", "Release 1" },
+ { 0.5f, -1.f, 1.f, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_GRAPH, NULL, "release0", "Release 1" },
{ 0.2f, -1.f, 1.f, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_GRAPH, NULL, "release1", "Release 2" },
- { 0.f, -1.f, 1.f, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_GRAPH, NULL, "release2", "Release 3" },
- { -0.2f, -1.f, 1.f, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_GRAPH, NULL, "release3", "Release 4" },
+ { -0.2f, -1.f, 1.f, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_GRAPH, NULL, "release2", "Release 3" },
+ { -0.5f, -1.f, 1.f, 0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_COEF | PF_PROP_GRAPH, NULL, "release3", "Release 4" },
{ 0, 0, 1, 0, PF_BOOL | PF_CTL_TOGGLE, NULL, "solo0", "Solo 1" },
{ 0, 0, 1, 0, PF_BOOL | PF_CTL_TOGGLE, NULL, "solo1", "Solo 2" },
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list