[SCM] calf/master: Mockup for adding second LFO and envelope.
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:40:12 UTC 2013
The following commit has been merged in the master branch:
commit c2d715ff5d589357cd8c32aa93eff388da562233
Author: Krzysztof Foltman <wdev at foltman.com>
Date: Sat May 8 14:03:54 2010 +0100
Mockup for adding second LFO and envelope.
diff --git a/gui/gui-monosynth.xml b/gui/gui-monosynth.xml
index 481073a..fa4f8c8 100644
--- a/gui/gui-monosynth.xml
+++ b/gui/gui-monosynth.xml
@@ -28,197 +28,285 @@
</vbox>
</frame>
<notebook>
- <hbox page="Audio path" spacing="8">
- <frame label="Oscillators">
- <vbox spacing="8">
- <table rows="3" cols="4" expand="1" fill="1">
- <label attach-x="0" attach-y="0" param="o1_wave"/>
- <label attach-x="1" attach-y="0" param="o1_pw"/>
- <label attach-x="2" attach-y="0" param="o2_pw"/>
- <label attach-x="3" attach-y="0" param="o2_wave"/>
- <combo attach-x="0" attach-y="1" param="o1_wave" fill-y="0"/>
- <knob attach-x="1" attach-y="1" param="o1_pw"/>
- <knob attach-x="2" attach-y="1" param="o2_pw"/>
- <combo attach-x="3" attach-y="1" param="o2_wave" fill-y="0"/>
- <value attach-x="1" attach-y="2" param="o1_pw"/>
- <value attach-x="2" attach-y="2" param="o2_pw"/>
- </table>
- <align>
- <hbox expand="0" fill="0">
- <if cond="directlink">
- <line-graph param="o1_wave" refresh="1" width="80" height="80" expand="0" fill="0"/>
- </if>
+ <vbox page="Audio path" spacing="8">
+ <hbox>
+ <frame label="Oscillator 1">
+ <hbox spacing="8">
+ <vbox>
+ <label param="o1_wave" text="Waveform"/>
+ <combo param="o1_wave" fill="0"/>
+ <label/>
+ </vbox>
<vbox>
- <label param="o12_mix" expand="0" fill="0"/>
- <hscale param="o12_mix" position="bottom" expand="0" fill="0"/>
+ <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="o2_wave" refresh="1" width="80" height="80" expand="0" fill="0"/>
+ <line-graph param="o1_wave" refresh="1" width="80" height="80" expand="0" fill="0"/>
</if>
</hbox>
- </align>
- <hbox expand="1" fill="1">
+ </frame>
+ <frame label="Oscillator 2">
+ <hbox spacing="8">
<vbox>
- <label param="o12_detune"/>
- <knob param="o12_detune"/>
- <value param="o12_detune"/>
+ <label param="o2_wave" text="Waveform"/>
+ <combo param="o2_wave" fill="0"/>
+ <label/>
</vbox>
<vbox>
- <label param="scale_detune"/>
- <knob param="scale_detune"/>
- <value param="scale_detune"/>
+ <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>
- <align>
- <vbox>
- <label param="phase_mode"/>
- <combo param="phase_mode"/>
- </vbox>
- </align>
+ <if cond="directlink">
+ <line-graph param="o2_wave" refresh="1" width="80" height="80" expand="0" fill="0"/>
+ </if>
<vbox>
- <label param="o2_xpose"/>
+ <label param="o2_xpose" text="Transpose"/>
<knob type="1" param="o2_xpose"/>
<value param="o2_xpose"/>
</vbox>
</hbox>
- </vbox>
- </frame>
- <frame label="Filter">
- <vbox spacing="8">
- <hbox>
- <vbox>
- <label param="cutoff"/>
- <knob param="cutoff"/>
- <value param="cutoff"/>
- </vbox>
- <vbox>
- <label param="res"/>
- <knob param="res"/>
- <value param="res"/>
- </vbox>
- </hbox>
- <align>
- <hbox fill="0" expand="0">
- <label param="filter" fill="0" expand="0"/>
- <combo param="filter" fill="0" expand="0"/>
- <if cond="directlink">
- <line-graph param="filter" refresh="1" width="80" height="80"/>
- </if>
- </hbox>
- </align>
- <hbox>
- <vbox>
- <label param="filter_sep"/>
- <knob type="1" param="filter_sep"/>
- <value param="filter_sep"/>
- </vbox>
- <vbox>
- <label param="key_follow"/>
- <knob param="key_follow"/>
- <value param="key_follow"/>
- </vbox>
- </hbox>
- </vbox>
- </frame>
- </hbox>
-
- <vbox page="Modulation" spacing="4">
- <frame label="LFO">
- <hbox spacing="4">
- <vbox>
- <label text="Rate"/>
- <knob param="lfo_rate"/>
- <value param="lfo_rate"/>
- </vbox>
- <vbox>
- <label text="Delay"/>
- <knob param="lfo_delay"/>
- <value param="lfo_delay"/>
- </vbox>
+ </frame>
+ </hbox>
+ <frame label="Oscillators - Common">
+ <hbox>
<vbox>
- <label text="To Cutoff"/>
- <knob param="lfo2filter" type="1"/>
- <value param="lfo2filter"/>
+ <label param="o12_detune"/>
+ <knob param="o12_detune"/>
+ <value param="o12_detune"/>
</vbox>
<vbox>
- <label text="To Pitch"/>
- <knob param="lfo2pitch"/>
- <value param="lfo2pitch"/>
+ <label param="scale_detune"/>
+ <knob param="scale_detune"/>
+ <value param="scale_detune"/>
</vbox>
- <vbox>
- <label text="To Osc PW"/>
- <knob param="lfo2pw"/>
- <value param="lfo2pw"/>
+ <vbox >
+ <label param="o12_mix" expand="0" fill="0"/>
+ <hscale param="o12_mix" position="bottom" expand="1" fill="1"/>
</vbox>
<vbox>
- <label text="ModWheel"/>
- <knob param="mwhl2lfo"/>
- <value param="mwhl2lfo"/>
+ <label param="phase_mode" />
+ <combo param="phase_mode" fill="0" expand="0"/>
+ <label />
</vbox>
</hbox>
</frame>
- <hbox spacing="8">
- <frame label="Note velocity">
- <vbox spacing="10">
- <vbox>
- <label text="To Cutoff"/>
- <knob param="vel2filter" size="3"/>
- <value param="vel2filter"/>
- </vbox>
- <vbox>
- <label text="To Amp"/>
- <knob param="vel2amp" size="3"/>
- <value param="vel2amp"/>
- </vbox>
- </vbox>
- </frame>
- <frame label="Envelope">
- <hbox spacing="4">
- <table cols="5" rows="1" homogeneous="1" fill-x="0" expand-x="0">
- <vbox attach-x="0" attach-y="0">
- <label param="adsr_a"/>
- <vscale param="adsr_a" inverted="1" size="2"/>
- <value param="adsr_a" width="4"/>
- </vbox>
- <vbox attach-x="1" attach-y="0">
- <label param="adsr_d"/>
- <vscale param="adsr_d" inverted="1" size="2"/>
- <value param="adsr_d" width="4"/>
+ <hbox>
+ <frame label="Filter">
+ <vbox spacing="8">
+ <align>
+ <hbox fill="0" expand="0">
+ <label param="filter" fill="0" expand="0"/>
+ <combo param="filter" fill="0" expand="0"/>
+ <if cond="directlink">
+ <line-graph param="filter" refresh="1" width="80" height="80"/>
+ </if>
+ </hbox>
+ </align>
+ <hbox>
+ <vbox>
+ <label param="cutoff"/>
+ <knob param="cutoff"/>
+ <value param="cutoff"/>
</vbox>
- <vbox attach-x="2" attach-y="0">
- <label param="adsr_s"/>
- <vscale param="adsr_s" inverted="1" size="2"/>
- <value param="adsr_s"/>
+ <vbox>
+ <label param="res"/>
+ <knob param="res"/>
+ <value param="res"/>
</vbox>
- <vbox attach-x="3" attach-y="0">
- <label param="adsr_f"/>
- <vscale param="adsr_f" inverted="1" size="2"/>
- <value param="adsr_f" width="4"/>
+ <vbox>
+ <label param="filter_sep"/>
+ <knob type="1" param="filter_sep"/>
+ <value param="filter_sep"/>
</vbox>
- <vbox attach-x="4" attach-y="0">
- <label param="adsr_r"/>
- <vscale param="adsr_r" inverted="1" size="2"/>
- <value param="adsr_r" width="4"/>
+ <vbox>
+ <label param="key_follow"/>
+ <knob param="key_follow"/>
+ <value param="key_follow"/>
</vbox>
- </table>
- <vbox>
+ </hbox>
+ </vbox>
+ </frame>
+ </hbox>
+ </vbox>
+
+ <vbox page="Modulation" spacing="4">
+ <hbox spacing="8">
+ <vbox>
+ <frame label="Note velocity">
+ <hbox spacing="10">
<vbox>
<label text="To Cutoff"/>
- <knob type="1" param="env2cutoff"/>
- <value param="env2cutoff"/>
+ <knob param="vel2filter" size="2"/>
+ <value param="vel2filter"/>
</vbox>
<vbox>
- <label text="To Res"/>
- <knob param="env2res"/>
- <value param="env2res"/>
+ <label text="To Amp"/>
+ <knob param="vel2amp" size="2"/>
+ <value param="vel2amp"/>
+ </vbox>
+ </hbox>
+ </frame>
+ <frame label="LFO 1">
+ <vbox spacing="10">
+ <hbox>
+ <vbox>
+ <label text="Rate"/>
+ <knob param="lfo_rate"/>
+ <value param="lfo_rate"/>
+ </vbox>
+ <vbox>
+ <label text="Delay"/>
+ <knob param="lfo_delay"/>
+ <value param="lfo_delay"/>
+ </vbox>
+ <vbox>
+ <label text="ModWheel"/>
+ <knob param="mwhl2lfo"/>
+ <value param="mwhl2lfo"/>
+ </vbox>
+ </hbox>
+ <hbox>
+ <vbox>
+ <label text="To Cutoff"/>
+ <knob param="lfo2filter" type="1"/>
+ <value param="lfo2filter"/>
+ </vbox>
+ <vbox>
+ <label text="To Pitch"/>
+ <knob param="lfo2pitch"/>
+ <value param="lfo2pitch"/>
+ </vbox>
+ <vbox>
+ <label text="To Osc PW"/>
+ <knob param="lfo2pw"/>
+ <value param="lfo2pw"/>
+ </vbox>
+ </hbox>
+ </vbox>
+ </frame>
+ <frame label="LFO 2">
+ <vbox spacing="10">
+ <hbox>
+ <vbox>
+ <label text="Rate"/>
+ <knob param="lfo_rate"/>
+ <value param="lfo_rate"/>
+ </vbox>
+ <vbox>
+ <label text="Delay"/>
+ <knob param="lfo_delay"/>
+ <value param="lfo_delay"/>
+ </vbox>
+ <vbox>
+ <label text="ModWheel"/>
+ <knob param="mwhl2lfo"/>
+ <value param="mwhl2lfo"/>
+ </vbox>
+ </hbox>
+ </vbox>
+ </frame>
+ </vbox>
+ <vbox>
+ <frame label="Envelope 1">
+ <hbox spacing="4">
+ <table cols="5" rows="1" homogeneous="1" fill-x="0" expand-x="0">
+ <vbox attach-x="0" attach-y="0">
+ <label param="adsr_a"/>
+ <vscale param="adsr_a" inverted="1" size="1"/>
+ <value param="adsr_a" width="4"/>
+ </vbox>
+ <vbox attach-x="1" attach-y="0">
+ <label param="adsr_d"/>
+ <vscale param="adsr_d" inverted="1" size="1"/>
+ <value param="adsr_d" width="4"/>
+ </vbox>
+ <vbox attach-x="2" attach-y="0">
+ <label param="adsr_s"/>
+ <vscale param="adsr_s" inverted="1" size="1"/>
+ <value param="adsr_s"/>
+ </vbox>
+ <vbox attach-x="3" attach-y="0">
+ <label param="adsr_f"/>
+ <vscale param="adsr_f" inverted="1" size="1"/>
+ <value param="adsr_f" width="4"/>
+ </vbox>
+ <vbox attach-x="4" attach-y="0">
+ <label param="adsr_r"/>
+ <vscale param="adsr_r" inverted="1" size="1"/>
+ <value param="adsr_r" width="4"/>
+ </vbox>
+ </table>
+ <vbox>
+ <vbox>
+ <label text="To Cutoff"/>
+ <knob type="1" param="env2cutoff"/>
+ <value param="env2cutoff"/>
+ </vbox>
+ <vbox>
+ <label text="To Res"/>
+ <knob param="env2res"/>
+ <value param="env2res"/>
+ </vbox>
+ <vbox>
+ <label text="To Amp"/>
+ <knob param="env2amp"/>
+ <value param="env2amp"/>
+ </vbox>
</vbox>
+ </hbox>
+ </frame>
+ <frame label="Envelope 2">
+ <hbox spacing="4">
+ <table cols="5" rows="1" homogeneous="1" fill-x="0" expand-x="0">
+ <vbox attach-x="0" attach-y="0">
+ <label param="adsr_a"/>
+ <vscale param="adsr_a" inverted="1" size="1"/>
+ <value param="adsr_a" width="4"/>
+ </vbox>
+ <vbox attach-x="1" attach-y="0">
+ <label param="adsr_d"/>
+ <vscale param="adsr_d" inverted="1" size="1"/>
+ <value param="adsr_d" width="4"/>
+ </vbox>
+ <vbox attach-x="2" attach-y="0">
+ <label param="adsr_s"/>
+ <vscale param="adsr_s" inverted="1" size="1"/>
+ <value param="adsr_s"/>
+ </vbox>
+ <vbox attach-x="3" attach-y="0">
+ <label param="adsr_f"/>
+ <vscale param="adsr_f" inverted="1" size="1"/>
+ <value param="adsr_f" width="4"/>
+ </vbox>
+ <vbox attach-x="4" attach-y="0">
+ <label param="adsr_r"/>
+ <vscale param="adsr_r" inverted="1" size="1"/>
+ <value param="adsr_r" width="4"/>
+ </vbox>
+ </table>
<vbox>
- <label text="To Amp"/>
- <knob param="env2amp"/>
- <value param="env2amp"/>
+ <vbox>
+ <label text="To Cutoff"/>
+ <knob type="1" param="env2cutoff"/>
+ <value param="env2cutoff"/>
+ </vbox>
+ <vbox>
+ <label text="To Res"/>
+ <knob param="env2res"/>
+ <value param="env2res"/>
+ </vbox>
+ <vbox>
+ <label text="To Amp"/>
+ <knob param="env2amp"/>
+ <value param="env2amp"/>
+ </vbox>
</vbox>
- </vbox>
- </hbox>
- </frame>
+ </hbox>
+ </frame>
+ </vbox>
</hbox>
</vbox>
<if cond="jackhost">
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list