[SCM] calf/master: + Compressor: another attempt at GUI

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 82d204e1615fc3a4a9427c93c8bac76530e63c10
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Tue Nov 25 22:08:14 2008 +0000

    + Compressor: another attempt at GUI

diff --git a/gui/gui-compressor.xml b/gui/gui-compressor.xml
index 7a03dc4..1cb2a6d 100644
--- a/gui/gui-compressor.xml
+++ b/gui/gui-compressor.xml
@@ -1,5 +1,5 @@
 <table border="10" rows="2" cols="2">
-    <hbox attach-x="1" attach-y="0">
+    <hbox attach-x="0" attach-y="0" attach-w="3">
     	<vbox>
              <label param="bypass"/>
              <align><toggle param="bypass" shrink="1"/></align>
@@ -18,11 +18,20 @@
         </vbox>
     </hbox>
     <if cond="directlink">
-        <vbox attach-x="1" attach-y="1" >
-            <line-graph refresh="1" width="320" height="320" param="compression" square="1"/>
-        </vbox>
+        <align attach-x="1" attach-y="1" scale-x="1" scale-y="1">
+            <table rows="7" cols="2">
+                <line-graph attach-x="0" attach-y="0" attach-h="7" refresh="1" width="160" height="160" param="compression" square="1" shrink-x="1"/>
+                <label attach-x="1" attach-y="0" param="compression"/>
+                <vumeter attach-x="1" attach-y="1" shrink-x="1" expand-y="0" param="compression" mode="2"/>
+                <label attach-x="1" attach-y="2" param="peak"/>
+                <vumeter attach-x="1" attach-y="3" shrink-x="1" expand-y="0" param="peak" mode="0"/>
+                <label attach-x="1" attach-y="4" param="clip"/>
+                <led attach-x="1" attach-y="5" param="clip" expand-x="0" expand-y="0"/>
+                <label attach-x="1" attach-y="6"/>
+            </table>
+        </align>
     </if>
-    <hbox attach-x="1" attach-y="2">
+    <hbox attach-x="0" attach-y="2" attach-w="3">
         <vbox border="10">
             <label param="attack" />
             <knob param="attack" />
diff --git a/src/gui.cpp b/src/gui.cpp
index 39a8c24..0ceaba8 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -471,6 +471,7 @@ GtkWidget *line_graph_param_control::create(plugin_gui *_gui, int _param_no)
     CalfLineGraph *clg = CALF_LINE_GRAPH(widget);
     widget->requisition.width = get_int("width", 40);
     widget->requisition.height = get_int("height", 40);
+    calf_line_graph_set_square(clg, get_int("square", 0));
     clg->source = gui->plugin->get_line_graph_iface();
     clg->source_id = param_no;
         

-- 
calf audio plugins packaging