[SCM] calf/master: New LED mode (red)

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 312ae8b122d690d8f245cd970284d579e18ecf8e
Author: Markus Schmidt <schmidt at boomshop.net>
Date:   Fri Oct 16 01:57:47 2009 +0200

    New LED mode (red)

diff --git a/gui/gui-compressor.xml b/gui/gui-compressor.xml
index df7329c..101bd03 100644
--- a/gui/gui-compressor.xml
+++ b/gui/gui-compressor.xml
@@ -39,7 +39,7 @@
         </vbox>
         <vbox shrink-x="1" expand-x="0" fill-x="0" expand="0" fill="0" attach-x="1" attach-y="0">
             <label param="clip" expand="0" fill="0" />
-            <led param="clip" expand="0" fill="0" />
+            <led param="clip" mode="1" expand="0" fill="0" />
         </vbox>
         <vbox expand-x="1" fill-x="1" expand="1" fill="1" attach-x="2" attach-y="0">
             <label param="peak" />
diff --git a/src/calf/ctl_led.h b/src/calf/ctl_led.h
index 6350f16..f57030d 100644
--- a/src/calf/ctl_led.h
+++ b/src/calf/ctl_led.h
@@ -36,6 +36,7 @@ G_BEGIN_DECLS
 struct CalfLed
 {
     GtkWidget parent;
+    int led_mode;
     gboolean led_state;
 };
 
diff --git a/src/ctl_led.cpp b/src/ctl_led.cpp
index 3626d9a..4eba021 100644
--- a/src/ctl_led.cpp
+++ b/src/ctl_led.cpp
@@ -51,9 +51,19 @@ calf_led_expose (GtkWidget *widget, GdkEventExpose *event)
     int yc = widget->allocation.height / 2;
     
     cairo_pattern_t *pt = cairo_pattern_create_radial(xc, yc, 0, xc, yc, xc > yc ? xc : yc);
-    cairo_pattern_add_color_stop_rgb(pt, 0.0, self->led_state ? 0.2 : 0.0, self->led_state ? 0.7 : 0.25, self->led_state ? 1.0 : 0.5);
-    cairo_pattern_add_color_stop_rgb(pt, 0.5, self->led_state ? 0.1 : 0.0, self->led_state ? 0.5 : 0.15, self->led_state ? 0.75 : 0.3);
-    cairo_pattern_add_color_stop_rgb(pt, 1.0, 0.0,                         self->led_state ? 0.3 : 0.1,  self->led_state ? 0.5 : 0.2);
+    switch (self->led_mode) {
+        default:
+        case 0:
+            cairo_pattern_add_color_stop_rgb(pt, 0.0, self->led_state ? 0.2 : 0.0, self->led_state ? 1.0 : 0.25, self->led_state ? 1.0 : 0.5);
+            cairo_pattern_add_color_stop_rgb(pt, 0.5, self->led_state ? 0.1 : 0.0, self->led_state ? 0.6 : 0.15, self->led_state ? 0.75 : 0.3);
+            cairo_pattern_add_color_stop_rgb(pt, 1.0, 0.0,                         self->led_state ? 0.3 : 0.1,  self->led_state ? 0.5 : 0.2);
+            break;
+        case 1:
+            cairo_pattern_add_color_stop_rgb(pt, 0.0, self->led_state ? 1.0 : 0.5, self->led_state ? 0.5 : 0.0, self->led_state ? 0.2 : 0.0);
+            cairo_pattern_add_color_stop_rgb(pt, 0.5, self->led_state ? 0.75 : 0.3, self->led_state ? 0.2 : 0.0, self->led_state ? 0.1 : 0.0);
+            cairo_pattern_add_color_stop_rgb(pt, 1.0, self->led_state ? 0.5 : 0.2, self->led_state ? 0.1 : 0.0, 0.0);
+            break;
+    }
 
     cairo_rectangle(c, ox, oy, sx, sy);
     cairo_set_source (c, pt);
diff --git a/src/custom_ctl.cpp b/src/custom_ctl.cpp
index 16fc21c..d585605 100644
--- a/src/custom_ctl.cpp
+++ b/src/custom_ctl.cpp
@@ -132,7 +132,7 @@ calf_line_graph_expose (GtkWidget *widget, GdkEventExpose *event)
     CalfLineGraph *lg = CALF_LINE_GRAPH(widget);
     //int ox = widget->allocation.x + 1, oy = widget->allocation.y + 1;
     int ox = 2, oy = 2;
-    int sx = widget->allocation.width - 2, sy = widget->allocation.height - 2;
+    int sx = widget->allocation.width - 4, sy = widget->allocation.height - 4;
 
     cairo_t *c = gdk_cairo_create(GDK_DRAWABLE(widget->window));
     GtkStyle *style;
diff --git a/src/gui_controls.cpp b/src/gui_controls.cpp
index 182ebb0..469fb89 100644
--- a/src/gui_controls.cpp
+++ b/src/gui_controls.cpp
@@ -323,6 +323,7 @@ GtkWidget *led_param_control::create(plugin_gui *_gui, int _param_no)
     gui = _gui, param_no = _param_no;
     // parameter_properties &props = get_props();
     widget = calf_led_new ();
+    CALF_LED(widget)->led_mode = get_int("mode", 0);
     return widget;
 }
 

-- 
calf audio plugins packaging