[SCM] calf/master: + GUI: new layouts (unfinished version, just to demonstrate new knobs) by Markus Schmidt
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:39:36 UTC 2013
The following commit has been merged in the master branch:
commit 5e31f3142bc686382acd2493b26741ef2da12233
Author: Krzysztof Foltman <wdev at foltman.com>
Date: Thu Oct 8 23:32:30 2009 +0100
+ GUI: new layouts (unfinished version, just to demonstrate new knobs) by Markus Schmidt
diff --git a/gui/gui-compressor.xml b/gui/gui-compressor.xml
index ef6f477..c9b040d 100644
--- a/gui/gui-compressor.xml
+++ b/gui/gui-compressor.xml
@@ -34,36 +34,36 @@
<vumeter param="peak" mode="0" shrink-y="0" />
</vbox>
</table>
- <hbox attach-x="0" attach-y="3" expand-y="0">
- <vbox border="10" expand="0">
+ <table attach-x="0" attach-y="3" expand-y="0" rows="1" cols="6" homogeneous="1" spacing="10">
+ <vbox expand="0" attach-x="0" attach-y="0">
<label param="attack" />
<knob param="attack" />
<value param="attack" />
</vbox>
- <vbox border="10" expand="0">
+ <vbox expand="0" attach-x="1" attach-y="0">
<label param="release" />
<knob param="release" />
<value param="release" />
</vbox>
- <vbox border="10" expand="0">
+ <vbox expand="0" attach-x="2" attach-y="0">
<label param="threshold" />
<knob param="threshold"/>
<value param="threshold" />
</vbox>
- <vbox border="10" expand="0">
+ <vbox expand="0" attach-x="3" attach-y="0">
<label param="ratio" />
<knob param="ratio" />
<value param="ratio" />
</vbox>
- <vbox border="10" expand="0">
+ <vbox expand="0" attach-x="4" attach-y="0">
<label param="makeup" />
<knob param="makeup" />
<value param="makeup" />
</vbox>
- <vbox border="10" expand="0">
+ <vbox expand="0" attach-x="5" attach-y="0">
<label param="knee" />
<knob param="knee" />
<value param="knee" />
</vbox>
- </hbox>
+ </table>
</table>
diff --git a/gui/gui-filter.xml b/gui/gui-filter.xml
index 77989d7..96c5b42 100644
--- a/gui/gui-filter.xml
+++ b/gui/gui-filter.xml
@@ -6,16 +6,16 @@
</table>
<hbox attach-x="0" attach-y="1" shrink-y="1" expand-x="1" fill-x="1">
<vbox border="10">
- <label param="freq" />
- <knob param="freq" />
- <value param="freq" />
- </vbox>
- <vbox border="10">
<label param="res" />
<knob param="res" />
<value param="res" />
</vbox>
<vbox border="10">
+ <label param="freq" />
+ <knob param="freq" size="4" />
+ <value param="freq" />
+ </vbox>
+ <vbox border="10">
<label param="inertia" />
<knob param="inertia"/>
<value param="inertia" />
diff --git a/gui/gui-flanger.xml b/gui/gui-flanger.xml
index d0f4ef9..b0b80be 100644
--- a/gui/gui-flanger.xml
+++ b/gui/gui-flanger.xml
@@ -1,44 +1,44 @@
<table rows="3" cols="1" border="10">
<frame label="Timbre" shrink-y="1" attach-x="0" attach-y="0" >
- <hbox>
- <vbox border="10" expand="0">
+ <table rows="1" cols="1" homogeneous="1" spacing="10">
+ <vbox expand="0" attach-x="0" attach-y="0">
<label param="min_delay" />
<knob param="min_delay" />
<value param="min_delay" />
</vbox>
- <vbox border="10" expand="0">
+ <vbox expand="0" attach-x="1" attach-y="0">
<label param="mod_depth" />
<knob param="mod_depth" />
<value param="mod_depth" />
</vbox>
- <vbox border="10" expand="0">
+ <vbox expand="0" attach-x="2" attach-y="0">
<label param="feedback" />
- <knob param="feedback" type="1"/>
+ <knob param="feedback" type="1" size="3" />
<value param="feedback" />
</vbox>
- <vbox border="10" expand="0">
+ <vbox expand="0" attach-x="3" attach-y="0">
<label param="dry" />
<knob param="dry" />
<value param="dry" />
</vbox>
- <vbox border="10" expand="0">
+ <vbox expand="0" attach-x="4" attach-y="0">
<label param="amount" />
<knob param="amount" />
<value param="amount" />
</vbox>
- </hbox>
+ </table>
</frame>
<frame label="LFO" shrink-y="1" attach-x="0" attach-y="1" >
<hbox>
<vbox border="10" expand="0">
<label param="mod_rate" />
- <knob param="mod_rate" />
+ <knob param="mod_rate" size="4" />
<value param="mod_rate" />
</vbox>
<align expand="0"><button param="reset" /></align>
<vbox border="10" expand="0">
<label param="stereo" />
- <knob param="stereo" type="3" />
+ <knob param="stereo" type="3" size="4" />
<value param="stereo" />
</vbox>
</hbox>
diff --git a/gui/gui-multichorus.xml b/gui/gui-multichorus.xml
index a5d4641..cc1fe6c 100644
--- a/gui/gui-multichorus.xml
+++ b/gui/gui-multichorus.xml
@@ -1,75 +1,75 @@
<table rows="3" cols="2" border="10">
<frame label="Timbre" attach-x="0" attach-y="0" shrink-y="1">
- <hbox>
- <vbox border="10">
+ <table rows="1" cols="5" homogeneous="1" spacing="10">
+ <vbox attach-x="0" attach-y="0">
<label param="min_delay" />
<knob param="min_delay" />
<value param="min_delay" />
</vbox>
- <vbox border="10">
+ <vbox attach-x="1" attach-y="0">
<label param="mod_depth" />
<knob param="mod_depth" />
<value param="mod_depth" />
</vbox>
- <vbox border="10">
+ <vbox attach-x="2" attach-y="0">
<label param="overlap" />
<knob param="overlap" />
<value param="overlap" />
</vbox>
- <vbox border="10">
+ <vbox attach-x="3" attach-y="0">
<label param="dry" />
<knob param="dry" />
<value param="dry" />
</vbox>
- <vbox border="10">
+ <vbox attach-x="4" attach-y="0">
<label param="amount" />
<knob param="amount" />
<value param="amount" />
</vbox>
- </hbox>
+ </table>
</frame>
<frame label="LFO" attach-x="0" attach-y="1" shrink-y="1">
- <hbox>
- <vbox border="10">
+ <table rows="1" cols="3" homogeneous="1" spacing="10">
+ <vbox attach-x="0" attach-y="0">
<label param="mod_rate" />
<knob param="mod_rate" />
<value param="mod_rate" />
</vbox>
- <vbox border="10">
+ <vbox attach-x="1" attach-y="0">
<label param="voices" />
<knob param="voices" />
<value param="voices" />
</vbox>
- <vbox border="10">
+ <vbox attach-x="2" attach-y="0">
<label param="stereo" />
<knob param="stereo" type="3" />
<value param="stereo" />
</vbox>
- <vbox border="10">
+ <vbox attach-x="3" attach-y="0">
<label param="vphase" />
<knob param="vphase" type="3" />
<value param="vphase" />
</vbox>
- </hbox>
+ </table>
</frame>
<frame label="Post Filter" attach-x="0" attach-y="2" shrink-y="1">
- <hbox>
- <vbox border="10">
+ <table rows="1" cols="3" homogeneous="1" spacing="10">
+ <vbox attach-x="0" attach-y="0">
<label param="freq" />
- <knob param="freq" />
+ <knob param="freq" size="3" />
<value param="freq" />
</vbox>
- <vbox border="10">
- <label param="freq2" />
- <knob param="freq2" />
- <value param="freq2" />
- </vbox>
- <vbox border="10">
+ <vbox attach-x="1" attach-y="0">
<label param="q" />
<knob param="q" />
<value param="q" />
</vbox>
- </hbox>
+ <vbox attach-x="2" attach-y="0">
+ <label param="freq2" />
+ <knob param="freq2" size="3" />
+ <value param="freq2" />
+ </vbox>
+ </table>
</frame>
<if cond="directlink">
<hbox attach-x="0" attach-y="3" fill-y="1" expand-y="1">
diff --git a/gui/gui-phaser.xml b/gui/gui-phaser.xml
index 019e71c..efb55be 100644
--- a/gui/gui-phaser.xml
+++ b/gui/gui-phaser.xml
@@ -1,33 +1,33 @@
<table border="10" cols="1" rows="2">
<frame label="Timbre" attach-x="0" attach-y="0" shrink-y="1">
<vbox>
- <table rows="2" cols="3">
- <vbox border="10" attach-x="0" attach-y="0">
+ <table rows="2" cols="3" homogeneous="1" spacing="10">
+ <vbox expand="0" attach-x="0" attach-y="0">
<label param="base_freq" />
<knob param="base_freq" />
<value param="base_freq" />
</vbox>
- <vbox border="10" attach-x="1" attach-y="0">
+ <vbox expand="0" attach-x="1" attach-y="0">
<label param="mod_depth" />
<knob param="mod_depth" />
<value param="mod_depth" />
</vbox>
- <vbox border="10" attach-x="2" attach-y="0">
+ <vbox expand="0" attach-x="2" attach-y="0">
<label param="amount" />
<knob param="amount" />
<value param="amount" />
</vbox>
- <vbox border="10" attach-x="0" attach-y="1">
+ <vbox expand="0" attach-x="0" attach-y="1">
<label param="stages" />
<knob param="stages" />
<value param="stages" />
</vbox>
- <vbox border="10" attach-x="1" attach-y="1">
+ <vbox expand="0" attach-x="1" attach-y="1">
<label param="feedback" />
- <knob param="feedback" type="1"/>
+ <knob param="feedback" type="1" size="3" />
<value param="feedback" />
</vbox>
- <vbox border="10" attach-x="2" attach-y="1">
+ <vbox expand="0" attach-x="2" attach-y="1">
<label param="dry" />
<knob param="dry" />
<value param="dry" />
@@ -39,13 +39,13 @@
<hbox>
<vbox border="10">
<label param="mod_rate" />
- <knob param="mod_rate" />
+ <knob param="mod_rate" size="4" />
<value param="mod_rate" />
</vbox>
<align><button param="reset" /></align>
<vbox border="10">
<label param="stereo" />
- <knob param="stereo" type="3" />
+ <knob param="stereo" type="3" size="4" />
<value param="stereo" />
</vbox>
</hbox>
diff --git a/gui/gui-reverb.xml b/gui/gui-reverb.xml
index 0850864..51ae4cb 100644
--- a/gui/gui-reverb.xml
+++ b/gui/gui-reverb.xml
@@ -1,8 +1,13 @@
<vbox border="10">
<hbox>
<vbox border="5">
+ <label param="predelay" />
+ <knob param="predelay" />
+ <value param="predelay" />
+ </vbox>
+ <vbox border="5">
<label param="decay_time" />
- <knob param="decay_time" />
+ <knob param="decay_time" size="4" />
<value param="decay_time" />
</vbox>
<vbox border="5">
@@ -10,39 +15,34 @@
<knob param="hf_damp" />
<value param="hf_damp" />
</vbox>
- <vbox border="5">
- <label param="dry" />
- <knob param="dry" />
- <value param="dry" />
- </vbox>
- <vbox border="5">
- <label param="amount" />
- <knob param="amount" />
- <value param="amount" />
- </vbox>
</hbox>
- <hbox>
- <vbox border="5">
+ <table homogeneous="1" spacing="5" rows="1" cols="5">
+ <vbox attach-x="0" attach-y="0">
<label param="diffusion" />
- <knob param="diffusion" />
+ <knob param="diffusion" size="1"/>
<value param="diffusion" />
</vbox>
- <vbox border="5">
- <label param="predelay" />
- <knob param="predelay" />
- <value param="predelay" />
- </vbox>
- <vbox border="5">
+ <vbox attach-x="1" attach-y="0">
<label param="bass_cut" />
- <knob param="bass_cut" />
+ <knob param="bass_cut" size="1" />
<value param="bass_cut" />
</vbox>
- <vbox border="5">
+ <vbox attach-x="2" attach-y="0">
<label param="treble_cut" />
- <knob param="treble_cut" />
+ <knob param="treble_cut" size="1" />
<value param="treble_cut" />
</vbox>
- </hbox>
+ <vbox attach-x="3" attach-y="0">
+ <label param="dry" />
+ <knob param="dry" size="1" />
+ <value param="dry" />
+ </vbox>
+ <vbox attach-x="4" attach-y="0">
+ <label param="amount" />
+ <knob param="amount" size="1" />
+ <value param="amount" />
+ </vbox>
+ </table>
<vbox border="5">
<label param="room_size" />
<combo param="room_size" />
diff --git a/gui/gui-vintagedelay.xml b/gui/gui-vintagedelay.xml
index 188e56c..ee2908a 100644
--- a/gui/gui-vintagedelay.xml
+++ b/gui/gui-vintagedelay.xml
@@ -1,9 +1,9 @@
<vbox border="10">
<frame label="Delay time">
<vbox>
- <table rows="4" cols="3">
+ <table rows="4" cols="3" border="5">
<label attach-x="0" attach-y="0" param="bpm" />
- <align attach-x="1" attach-y="0" scale-x="0"><knob param="bpm" /></align>
+ <align attach-x="1" attach-y="0" scale-x="0"><knob param="bpm" size="4" /></align>
<spin attach-x="2" attach-y="0" param="bpm" digits="2"/>
<label attach-x="0" attach-y="1" param="subdiv" />
<hscale attach-x="1" attach-y="1" param="subdiv" />
@@ -22,18 +22,10 @@
<frame label="Mixing">
<vbox>
- <hbox>
- <label param="mix_mode" />
- <combo param="mix_mode" expand-x="1" />
- </hbox>
- <hbox>
- <align><label param="medium" /></align>
- <combo param="medium" expand-x="1" />
- </hbox>
- <hbox>
+ <hbox border="5">
<vbox>
<label param="feedback" />
- <knob param="feedback"/>
+ <knob param="feedback" size="3"/>
<value param="feedback"/>
</vbox>
<vbox>
@@ -47,6 +39,14 @@
<value param="amount"/>
</vbox>
</hbox>
+ <hbox border="5">
+ <label param="mix_mode" />
+ <combo param="mix_mode" expand-x="1" />
+ </hbox>
+ <hbox border="5">
+ <align><label param="medium" /></align>
+ <combo param="medium" expand-x="1" />
+ </hbox>
</vbox>
</frame>
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list