generate knob pixbufs at run time but draw from the pixbufs; remove mfimg utility and existing knob icon png files

git-svn-id: svn://localhost/ardour2/branches/3.0@7166 d708f5d6-7413-0410-9779-e7cbd77b26cf

9 files changed, 166 insertions, 160 deletions

diff --git a/gtk2_ardour/icons/bigknob.png b/gtk2_ardour/icons/bigknob.png
deleted file mode 100644
index 1511d23127..0000000000
--- a/gtk2_ardour/icons/bigknob.png
+++ /dev/null
diff --git a/gtk2_ardour/icons/littleknob.png b/gtk2_ardour/icons/littleknob.png
deleted file mode 100644
index 76544e1399..0000000000
--- a/gtk2_ardour/icons/littleknob.png
+++ /dev/null
diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc
index 5b60942bb1..4ec4166dd1 100644
--- a/gtk2_ardour/monitor_section.cc
+++ b/gtk2_ardour/monitor_section.cc
@@ -6,6 +6,7 @@
 #include "gtkmm2ext/bindable_button.h"
 #include "gtkmm2ext/tearoff.h"
 #include "gtkmm2ext/actions.h"
+#include "gtkmm2ext/motionfeedback.h"
 
 #include "ardour/dB.h"
 #include "ardour/monitor_processor.h"
@@ -738,27 +739,34 @@ MonitorSection::setup_knob_images ()
 {
         try {
                 
-                big_knob_pixbuf = ::get_icon ("bigknob");
-                
+                big_knob_pixbuf = MotionFeedback::render_pixbuf (80);                
+
         }  catch (...) {
                 
-                error << "No knob image found (or not loadable) at "
-                      << " .... "
-                      << endmsg;
+                error << "No usable large knob image" << endmsg;
+                throw failed_constructor ();
+        }
+
+        if (!big_knob_pixbuf) {
+                error << "No usable large knob image" << endmsg;
                 throw failed_constructor ();
         }
         
         try {
-                
-                little_knob_pixbuf = ::get_icon ("littleknob");
+
+                little_knob_pixbuf = MotionFeedback::render_pixbuf (30);
                 
         }  catch (...) {
                 
-                error << "No knob image found (or not loadable) at "
-                      << " .... "
-                      << endmsg;
+                error << "No usable small knob image" << endmsg;
                 throw failed_constructor ();
         }
+
+        if (!little_knob_pixbuf) {
+                error << "No usable small knob image" << endmsg;
+                throw failed_constructor ();
+        }
+                
 }
 
 bool
diff --git a/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h b/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h
index a567c7d408..ba70e30a07 100644
--- a/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h
+++ b/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h
@@ -64,8 +64,8 @@ class MotionFeedback : public Gtk::VBox
 
 	void set_controllable (boost::shared_ptr<PBD::Controllable> c) { binding_proxy.set_controllable (c); }
         void set_lamp_color (const Gdk::Color&);
-
-        void render_file (const std::string& path, int width, int height);
+        
+        static Glib::RefPtr<Gdk::Pixbuf> render_pixbuf (int size);
 
  protected:
 	gfloat _range;
@@ -111,7 +111,7 @@ class MotionFeedback : public Gtk::VBox
 	GdkColor lamp_bright;
 	GdkColor lamp_dark;
 
-        void core_draw (cairo_t*, int, double, double, double);
+        static void core_draw (cairo_t*, int, double, double, double, double, const GdkColor* bright, const GdkColor* dark);
 };
 
 } /* namespace */
diff --git a/libs/gtkmm2ext/gtkmm2ext/prolooks-helpers.h b/libs/gtkmm2ext/gtkmm2ext/prolooks-helpers.h
index 4f1ed780e3..3d868b1084 100644
--- a/libs/gtkmm2ext/gtkmm2ext/prolooks-helpers.h
+++ b/libs/gtkmm2ext/gtkmm2ext/prolooks-helpers.h
@@ -189,21 +189,21 @@ CairoColor* cairo_color_shade (CairoColor* self, double shade_factor);
 void cairo_color_set_to (CairoColor* self, CairoColor* a_color);
 void cairo_color_set_as_source_in (CairoColor* self, cairo_t* cr);
 void cairo_color_add_color_stop_to (CairoColor* self, cairo_pattern_t* p, double offset);
-CairoColor* prolooks_gdk_color_to_cairo (GdkColor* color);
+CairoColor* prolooks_gdk_color_to_cairo (const GdkColor* color);
 void prolooks_color_from_string (const char* webcolor, GdkColor* result);
 static void cairo_color_finalize (CairoColor* obj);
 GType prolooks_button_state_get_type (void);
 GType prolooks_button_type_get_type (void);
 void prolooks_set_line_width_from_device (cairo_t* cr);
-char* prolooks_color_to_string (GdkColor* color);
+char* prolooks_color_to_string (const GdkColor* color);
 CairoColor* prolooks_cairo_color_from_string (const char* webcolor);
-void prolooks_set_source_color (cairo_t* cr, GdkColor* color, double alpha);
-void prolooks_gdk_color_to_cairo_color (GdkColor* color, double* red, double* green, double* blue);
+void prolooks_set_source_color (cairo_t* cr, const GdkColor* color, double alpha);
+void prolooks_gdk_color_to_cairo_color (const GdkColor* color, double* red, double* green, double* blue);
 void prolooks_cairo_color_to_gdk (CairoColor* cairo_color, GdkColor* result);
 void prolooks_set_source_color_string (cairo_t* cr, const char* color, double alpha);
-void prolooks_add_color_stop (cairo_pattern_t* p, double offset, GdkColor* color, double alpha);
+void prolooks_add_color_stop (cairo_pattern_t* p, double offset, const GdkColor* color, double alpha);
 void prolooks_add_color_stop_str (cairo_pattern_t* p, double offset, const char* color, double alpha);
-cairo_pattern_t* prolooks_create_gradient (double x1, double y1, double x2, double y2, GdkColor* start, GdkColor* stop, double alpha_start, double alpha_stop);
+cairo_pattern_t* prolooks_create_gradient (double x1, double y1, double x2, double y2, const GdkColor* start, const GdkColor* stop, double alpha_start, double alpha_stop);
 cairo_pattern_t* prolooks_create_gradient_str (double x1, double y1, double x2, double y2, const char* start, const char* stop, double alpha_start, double alpha_stop);
 void prolooks_rounded_rect (cairo_t* cr, double x, double y, double w, double h, double radius_x, double radius_y);
 void prolooks_background_gradient (cairo_t* cr, double w, double h);
@@ -215,7 +215,7 @@ enum  {
 double prolooks_hsl_get_hue (ProlooksHSL* self);
 char* prolooks_hsl_to_string (ProlooksHSL* self);
 void prolooks_hsl_to_gdk_color (ProlooksHSL* self, GdkColor* result);
-void prolooks_hsl_from_gdk_color (ProlooksHSL* self, GdkColor* color);
+void prolooks_hsl_from_gdk_color (ProlooksHSL* self, const GdkColor* color);
 void prolooks_hsl_set_hue (ProlooksHSL* self, double value);
 static void prolooks_hsl_finalize (ProlooksHSL* obj);
 gpointer prolooks_hsv_ref (gpointer instance);
@@ -233,9 +233,9 @@ double prolooks_hsv_get_hue (ProlooksHSV* self);
 double prolooks_hsv_get_saturation (ProlooksHSV* self);
 double prolooks_hsv_get_value (ProlooksHSV* self);
 char* prolooks_hsv_to_string (ProlooksHSV* self);
-void prolooks_hsv_from_gdk_color (ProlooksHSV* self, GdkColor* color);
-ProlooksHSV* prolooks_hsv_new_for_gdk_color (GdkColor* color);
-ProlooksHSV* prolooks_hsv_construct_for_gdk_color (GType object_type, GdkColor* color);
+void prolooks_hsv_from_gdk_color (ProlooksHSV* self, const GdkColor* color);
+ProlooksHSV* prolooks_hsv_new_for_gdk_color (const GdkColor* color);
+ProlooksHSV* prolooks_hsv_construct_for_gdk_color (GType object_type, const GdkColor* color);
 void prolooks_hsv_from_cairo_color (ProlooksHSV* self, CairoColor* color);
 ProlooksHSV* prolooks_hsv_new_for_cairo_color (CairoColor* color);
 ProlooksHSV* prolooks_hsv_construct_for_cairo_color (GType object_type, CairoColor* color);
@@ -247,7 +247,7 @@ void prolooks_hsv_set_saturation (ProlooksHSV* self, double value);
 ProlooksHSV* prolooks_hsv_new (void);
 ProlooksHSV* prolooks_hsv_construct (GType object_type);
 static void prolooks_hsv_finalize (ProlooksHSV* obj);
-void prolooks_shade_color (GdkColor* orig, double shade_ratio, GdkColor* result);
+void prolooks_shade_color (const GdkColor* orig, double shade_ratio, GdkColor* result);
 GdkPixbuf* prolooks_cairo_image_surface_to_pixbuf (cairo_surface_t* surface);
 
 #ifdef __cplusplus
diff --git a/libs/gtkmm2ext/mfimg.cc b/libs/gtkmm2ext/mfimg.cc
deleted file mode 100644
index 12a79fc6c5..0000000000
--- a/libs/gtkmm2ext/mfimg.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <cstdlib>
-#include <gtkmm.h>
-#include "gtkmm2ext/motionfeedback.h"
-
-using namespace std;
-using namespace Gtkmm2ext;
-
-int
-main (int argc, char* argv[])
-{
-        Gtk::Main app (&argc, &argv);
-        int size = atoi (argv[1]);
-        Glib::RefPtr<Gdk::Pixbuf> pb;
-        MotionFeedback mf (pb, MotionFeedback::Rotary, 0, 0, false, size, size);
-        mf.render_file (argv[2], size, size);
-}
diff --git a/libs/gtkmm2ext/motionfeedback.cc b/libs/gtkmm2ext/motionfeedback.cc
index 683d1befa4..2637ae7a2e 100644
--- a/libs/gtkmm2ext/motionfeedback.cc
+++ b/libs/gtkmm2ext/motionfeedback.cc
@@ -19,6 +19,8 @@
 
 #include <iostream>
 #include <cmath>
+#include <cstdlib>
+#include <algorithm>
 #include <unistd.h>
 #include <stdio.h> /* for snprintf, grrr */
 
@@ -324,10 +326,9 @@ MotionFeedback::adjustment_changed ()
 }
 
 void
-MotionFeedback::core_draw (cairo_t* cr, int phase, double radius, double x, double y)
+MotionFeedback::core_draw (cairo_t* cr, int phase, double size, double progress_width, double xorigin, double yorigin,
+                           const GdkColor* bright, const GdkColor* dark)
 {
-	double width;
-	double height;
 	double xc;
 	double yc;
 	double start_angle;
@@ -340,7 +341,6 @@ MotionFeedback::core_draw (cairo_t* cr, int phase, double radius, double x, doub
 	double start_angle_y;
 	double end_angle_x;
 	double end_angle_y;
-	double progress_width;
 	double progress_radius;
 	double progress_radius_inner;
 	double progress_radius_outer;
@@ -350,17 +350,31 @@ MotionFeedback::core_draw (cairo_t* cr, int phase, double radius, double x, doub
 	cairo_pattern_t* progress_shine;
 	double degrees;
 	cairo_pattern_t* knob_ripples;
+        double pxs;
+        double pys;
 
 	g_return_if_fail (cr != NULL);
+        
+	progress_radius = 40.0;
+	progress_radius_inner = progress_radius - (progress_width / 2.0);
+	progress_radius_outer = progress_radius + (progress_width / 2.0);
+	knob_disc_radius = progress_radius_inner - 5.0;
 
-	cairo_set_source_rgba (cr, 0.75, 0.75, 0.75, (double) 1.0);
-	cairo_rectangle (cr, (double) 0, (double) 0, subwidth, subheight);
-	cairo_fill (cr);
+        const double pad = 2.0; /* line width for boundary of progress ring */
+        const double actual_width = ((2.0 * pad) + (2.0 * progress_radius_outer));
+        const double scale_factor = size / actual_width;
+
+        /* knob center is at middle of the area bounded by (xorigin,yorigin) and (xorigin+size, yorigin+size)
+           but the coordinates will be scaled by the scale factor when cairo uses them so first
+           adjust them by the reciprocal of the scale factor.
+        */
+
+	xc = (xorigin + (size / 2.0)) * (1.0/scale_factor);
+        yc = (yorigin + (size / 2.0)) * (1.0/scale_factor);
+
+        pxs = xorigin * (1.0/scale_factor);
+        pys = yorigin * (1.0/scale_factor);
 
-	width = 105.0;
-	height = 105.0;
-	xc = width / 2.0;
-	yc = height / 2.0;
 	start_angle = 0.0;
 	end_angle = 0.0;
 	value_angle = 0.0;
@@ -376,32 +390,24 @@ MotionFeedback::core_draw (cairo_t* cr, int phase, double radius, double x, doub
 	start_angle_y = sin (start_angle);
 	end_angle_x = cos (end_angle);
 	end_angle_y = sin (end_angle);
-	cairo_save (cr);
-	//cairo_translate (cr, x, (double) 0);
-	cairo_scale (cr, (2.0 * radius) / width, (2.0 * radius) / height);
-	//cairo_translate (cr, -xc, (double) 0);
 
-        pattern = prolooks_create_gradient_str ((double) 32, (double) 16, (double) 75, (double) 16, "#d4c8b9", "#ae977b", 1.0, 1.0);
+	cairo_scale (cr, scale_factor, scale_factor);
+
+        pattern = prolooks_create_gradient_str (pxs + 32.0, pys + 16.0, pxs + 75.0, pys + 16.0, "#d4c8b9", "#ae977b", 1.0, 1.0);
         cairo_set_source (cr, pattern);
 	cairo_pattern_destroy (pattern);
 	cairo_set_line_width (cr, 2.0);
 	cairo_arc (cr, xc, yc, 31.5, 0.0, 2 * G_PI);
 	cairo_stroke (cr);
 
-	progress_width = 10.0;
-	progress_radius = 40.0;
-	progress_radius_inner = progress_radius - (progress_width / 2.0);
-	progress_radius_outer = progress_radius + (progress_width / 2.0);
-	knob_disc_radius = progress_radius_inner - 5.0;
-
-        pattern = prolooks_create_gradient_str ((double) 20, (double) 20, (double) 89, (double) 87, "#2f2f4c", "#090a0d", 1.0, 1.0);
+        pattern = prolooks_create_gradient_str (pxs + 20.0, pys + 20.0, pxs + 89.0, pys + 87.0, "#2f2f4c", "#090a0d", 1.0, 1.0);
 	cairo_set_source (cr, pattern);
 	cairo_pattern_destroy (pattern);
 	cairo_set_line_width (cr, progress_width);
 	cairo_arc (cr, xc, yc, progress_radius, start_angle, end_angle);
 	cairo_stroke (cr);
 
-        pattern = prolooks_create_gradient ((double) 20, (double) 20, (double) 89, (double) 87, &lamp_bright, &lamp_dark, 1.0, 1.0);
+        pattern = prolooks_create_gradient (pxs + 20.0, pys + 20.0, pxs + 89.0, pys + 87.0, bright, dark, 1.0, 1.0);
 	cairo_set_source (cr, pattern);
 	cairo_pattern_destroy (pattern);
 	cairo_set_line_width (cr, progress_width);
@@ -411,7 +417,7 @@ MotionFeedback::core_draw (cairo_t* cr, int phase, double radius, double x, doub
 	cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
 	progress_rim_width = 2.0;
 	cairo_set_line_width (cr, progress_rim_width);
-        pattern = prolooks_create_gradient_str ((double) 18, (double) 79, (double) 35, (double) 79, "#dfd5c9", "#dfd5c9", 1.0, 0.0);
+        pattern = prolooks_create_gradient_str (pxs + 18.0, pys + 79.0, pxs + 35.0, pys + 79.0, "#dfd5c9", "#dfd5c9", 1.0, 0.0);
 	cairo_set_source (cr, pattern);
 	cairo_pattern_destroy (pattern);
 	cairo_move_to (cr, xc + (progress_radius_outer * start_angle_x), yc + (progress_radius_outer * start_angle_y));
@@ -423,24 +429,24 @@ MotionFeedback::core_draw (cairo_t* cr, int phase, double radius, double x, doub
 	cairo_line_to (cr, xc + (progress_radius_inner * end_angle_x), yc + (progress_radius_inner * end_angle_y));
 	cairo_stroke (cr);
 
-        // pattern = prolooks_create_gradient_str ((double) 95, (double) 6, (double) 5, (double) 44, "#dfd5c9", "#b0a090", 1.0, 1.0);
-        pattern = prolooks_create_gradient_str ((double) 95, (double) 6, (double) 5, (double) 44, "#000000", "#000000", 1.0, 1.0);
+        // pattern = prolooks_create_gradient_str (95.0, 6.0, 5.0, 44.0, "#dfd5c9", "#b0a090", 1.0, 1.0);
+        pattern = prolooks_create_gradient_str (pxs + 95.0, pys + 6.0, pxs + 5.0, pys + 44.0, "#000000", "#000000", 1.0, 1.0);
 	cairo_set_source (cr, pattern);
 	cairo_pattern_destroy (pattern);
 	cairo_arc (cr, xc, yc, progress_radius_outer, start_angle, end_angle);
 	cairo_stroke (cr);
 
 	cairo_set_line_cap (cr, CAIRO_LINE_CAP_BUTT);
-        pattern = prolooks_create_gradient ((double) 20, (double) 20, (double) 89, (double) 87, &lamp_bright, &lamp_dark, 0.25, 0.25);
+        pattern = prolooks_create_gradient (pxs + 20.0, pys + 20.0, pxs + 89.0, pys + 87.0, bright, dark, 0.25, 0.25);
 	cairo_set_source (cr, pattern);
 	cairo_pattern_destroy (pattern);
 	cairo_set_line_width (cr, progress_width);
 	cairo_arc (cr, xc, yc, progress_radius, start_angle, value_angle + (G_PI / 180.0));
 	cairo_stroke (cr);
 
-        progress_shine = prolooks_create_gradient_str ((double) 89, (double) 73, (double) 34, (double) 16, "#ffffff", "#ffffff", 0.3, 0.04);
+        progress_shine = prolooks_create_gradient_str (pxs + 89.0, pys + 73.0, pxs + 34.0, pys + 16.0, "#ffffff", "#ffffff", 0.3, 0.04);
         cairo_pattern_add_color_stop_rgba (progress_shine, 0.5, 1.0, 1.0, 1.0, 0.0);
-        if (subwidth > 50) {
+        if (size > 50) {
                 cairo_pattern_add_color_stop_rgba (progress_shine, 0.75, 1.0, 1.0, 1.0, 0.3);
         } else {
                 cairo_pattern_add_color_stop_rgba (progress_shine, 0.75, 1.0, 1.0, 1.0, 0.2);
@@ -453,25 +459,25 @@ MotionFeedback::core_draw (cairo_t* cr, int phase, double radius, double x, doub
 
 	cairo_set_line_width (cr, 1.0);
 	cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
-	cairo_arc (cr, xc, yc, progress_radius_inner, (double) 0, 2 * G_PI);
-        pattern = prolooks_create_gradient_str ((double) 35, (double) 31, (double) 75, (double) 72, "#68625c", "#44494b", 1.0, 1.0);
+	cairo_arc (cr, xc, yc, progress_radius_inner, 0.0, 2 * G_PI);
+        pattern = prolooks_create_gradient_str (pxs + 35.0, pys + 31.0, pxs + 75.0, pys + 72.0, "#68625c", "#44494b", 1.0, 1.0);
 	cairo_set_source (cr, pattern);
 	cairo_pattern_destroy (pattern);
 	cairo_fill (cr);
-	cairo_set_source_rgb (cr, (double) 0, (double) 0, (double) 0);
-	cairo_arc (cr, xc, yc, progress_radius_inner, (double) 0, 2 * G_PI);
+	cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
+	cairo_arc (cr, xc, yc, progress_radius_inner, 0.0, 2 * G_PI);
 	cairo_stroke (cr);
 
-        pattern = prolooks_create_gradient_str ((double) 42, (double) 34, (double) 68, (double) 70, "#e7ecef", "#9cafb8", 1.0, 1.0);
+        pattern = prolooks_create_gradient_str (pxs + 42.0, pys + 34.0, pxs + 68.0, pys + 70.0, "#e7ecef", "#9cafb8", 1.0, 1.0);
 	cairo_set_source (cr, pattern);
 	cairo_pattern_destroy (pattern);
-	cairo_arc (cr, xc, yc, knob_disc_radius, (double) 0, 2 * G_PI);
+	cairo_arc (cr, xc, yc, knob_disc_radius, 0.0, 2 * G_PI);
 	cairo_fill (cr);
 
 	cairo_set_line_width (cr, 2.0);
 	degrees = G_PI / 180.0;
-        pattern = prolooks_create_gradient_str ((double) 38, (double) 34, (double) 70, (double) 68, "#ffffff", "#caddf2", 0.2, 0.2);
-	cairo_set_source (cr, pattern);
+        pattern = prolooks_create_gradient_str (pxs + 38.0, pys + 34.0, pxs + 70.0, pys + 68.0, "#ffffff", "#caddf2", 0.2, 0.2);
+        cairo_set_source (cr, pattern);
 	cairo_pattern_destroy (pattern);
 	cairo_move_to (cr, xc, yc);
 	cairo_arc (cr, xc, yc, knob_disc_radius - 1, (-154) * degrees, (-120) * degrees);
@@ -479,7 +485,7 @@ MotionFeedback::core_draw (cairo_t* cr, int phase, double radius, double x, doub
 	cairo_arc (cr, xc, yc, knob_disc_radius - 1, (G_PI / 2.0) - (60 * degrees), (G_PI / 2.0) - (29 * degrees));
 	cairo_fill (cr);
 
-        pattern = prolooks_create_gradient_str ((double) 50, (double) 40, (double) 62, (double) 60, "#a1adb6", "#47535c", 0.07, 0.15);
+        pattern = prolooks_create_gradient_str (pxs + 50.0, pys + 40.0, pxs + 62.0, pys + 60.0, "#a1adb6", "#47535c", 0.07, 0.15);
 	cairo_set_source (cr, pattern);
 	cairo_pattern_destroy (pattern);
 	cairo_move_to (cr, xc, yc);
@@ -488,7 +494,7 @@ MotionFeedback::core_draw (cairo_t* cr, int phase, double radius, double x, doub
 	cairo_arc (cr, xc, yc, knob_disc_radius - 1, G_PI - (67 * degrees), G_PI - (27 * degrees));
 	cairo_fill (cr);
 
-	knob_ripples = cairo_pattern_create_radial (xc, yc, (double) 0, xc, yc, (double) 4);
+	knob_ripples = cairo_pattern_create_radial (xc, yc, 0.0, xc, yc, 4.0);
 	prolooks_add_color_stop_str (knob_ripples, 0.0, "#e7ecef", 0.05);
 	prolooks_add_color_stop_str (knob_ripples, 0.5, "#58717d", 0.05);
 	prolooks_add_color_stop_str (knob_ripples, 0.75, "#d1d9de", 0.05);
@@ -496,41 +502,41 @@ MotionFeedback::core_draw (cairo_t* cr, int phase, double radius, double x, doub
 	cairo_pattern_set_extend (knob_ripples, CAIRO_EXTEND_REPEAT);
 	cairo_set_line_width (cr, 0.0);
 	cairo_set_source (cr, knob_ripples);
-	cairo_arc (cr, xc, yc, knob_disc_radius, (double) 0, 2 * G_PI);
+	cairo_arc (cr, xc, yc, knob_disc_radius, 0.0, 2 * G_PI);
 	cairo_fill (cr);
 
 	cairo_save (cr);
 	cairo_translate (cr, xc + (knob_disc_radius * value_x), yc + (knob_disc_radius * value_y));
 	cairo_rotate (cr, value_angle - G_PI);
-	cairo_set_source (cr, pattern = prolooks_create_gradient_str ((double) 16, (double) (-2), (double) 9, (double) 13, "#e7ecef", "#9cafb8", 0.8, 0.8));
+        pattern = prolooks_create_gradient_str (pxs + 16.0, pys + -2.0, pxs + 9.0, pys + 13.0, "#e7ecef", "#9cafb8", 0.8, 0.8);
+	cairo_set_source (cr, pattern);
 	cairo_pattern_destroy (pattern);
-	cairo_move_to (cr, (double) 0, (double) 4);
-	cairo_line_to (cr, (double) 17, (double) 4);
-	cairo_curve_to (cr, (double) 19, (double) 4, (double) 21, (double) 2, (double) 21, (double) 0);
-	cairo_curve_to (cr, (double) 21, (double) (-2), (double) 19, (double) (-4), (double) 17, (double) (-4));
-	cairo_line_to (cr, (double) 0, (double) (-4));
+	cairo_move_to (cr, 0.0, 4.0);
+	cairo_line_to (cr, 17.0, 4.0);
+	cairo_curve_to (cr, 19.0, 4.0, 21.0, 2.0, 21.0, 0.0);
+	cairo_curve_to (cr, 21.0, -2.0, 19.0, -4.0, 17.0, -4.0);
+	cairo_line_to (cr, 0.0, -4.0);
 	cairo_close_path (cr);
 	cairo_fill (cr);
 
-        pattern = prolooks_create_gradient_str ((double) 9, (double) (-2), (double) 9, (double) 2, "#68625c", "#44494b", 1.0, 1.0);
+        pattern = prolooks_create_gradient_str (pxs + 9.0, pys + -2.0, pxs + 9.0, pys + 2.0, "#68625c", "#44494b", 1.0, 1.0);
 	cairo_set_source (cr, pattern);
 	cairo_pattern_destroy (pattern);
-	cairo_move_to (cr, (double) 0, (double) 2);
-	cairo_line_to (cr, (double) 16, (double) 2);
-	cairo_curve_to (cr, (double) 17, (double) 2, (double) 18, (double) 1, (double) 18, (double) 0);
-	cairo_curve_to (cr, (double) 18, (double) (-1), (double) 17, (double) (-2), (double) 16, (double) (-2));
-	cairo_line_to (cr, (double) 0, (double) (-2));
+	cairo_move_to (cr, 0.0, 2.0);
+	cairo_line_to (cr, 16.0, 2.0);
+	cairo_curve_to (cr, 17.0, 2.0, 18.0, 1.0, 18.0, 0.0);
+	cairo_curve_to (cr, 18.0, -1.0, 17.0, -2.0, 16.0, -2.0);
+	cairo_line_to (cr, 0.0, -2.0);
 	cairo_close_path (cr);
 	cairo_fill (cr);
 
 	cairo_restore (cr);
 	cairo_set_line_width (cr, 2.0);
-        pattern = prolooks_create_gradient_str ((double) 38, (double) 32, (double) 70, (double) 67, "#3d3d3d", "#000000", 1.0, 1.0);
+        pattern = prolooks_create_gradient_str (pxs + 38.0, pys + 32.0, pxs + 70.0, pys + 67.0, "#3d3d3d", "#000000", 1.0, 1.0); 
         cairo_set_source (cr, pattern);
 	cairo_pattern_destroy (pattern);
-	cairo_arc (cr, xc, yc, knob_disc_radius, (double) 0, 2 * G_PI);
+	cairo_arc (cr, xc, yc, knob_disc_radius, 0.0, 2 * G_PI);
 	cairo_stroke (cr);
-	cairo_restore (cr);
 
 	cairo_pattern_destroy (knob_ripples);
 }
@@ -571,23 +577,13 @@ MotionFeedback::pixwin_expose_event (GdkEventExpose* ev)
 			phase = (phase + 63) % 64;
 	}
 
-        if (pixbuf) {
-                std::cerr << "Render from pixbuf\n";
-                GtkWidget* widget = GTK_WIDGET(pixwin.gobj());
-                gdk_draw_pixbuf (GDK_DRAWABLE(window), widget->style->fg_gc[0], 
-                                 pixbuf->gobj(), 
-                                 phase * subwidth, type * subheight, 
-                                 0, 0, subwidth, subheight, GDK_RGB_DITHER_NORMAL, 0, 0);
-        } else {
-                std::cerr << "Render with cairo\n";
-                cairo_t* cr = gdk_cairo_create (GDK_DRAWABLE (window));
-                
-                gdk_cairo_rectangle (cr, &ev->area);
-                cairo_clip (cr);
-                
-                core_draw (cr, phase, subheight/2, subwidth/2, subheight/2);
-                cairo_destroy (cr);
-        }
+        phase = std::min (phase, 63);
+
+        GtkWidget* widget = GTK_WIDGET(pixwin.gobj());
+        gdk_draw_pixbuf (GDK_DRAWABLE(window), widget->style->fg_gc[0], 
+                         pixbuf->gobj(), 
+                         phase * subwidth, type * subheight, 
+                         0, 0, subwidth, subheight, GDK_RGB_DITHER_NORMAL, 0, 0);
 
 	return true;
 }
@@ -647,36 +643,64 @@ MotionFeedback::set_lamp_color (const Gdk::Color& c)
 	lamp_dark = (prolooks_hsv_to_gdk_color (lamp_hsv, &col3), col3);
 }
 
-void
-MotionFeedback::render_file (const std::string& path, int w, int h)
+Glib::RefPtr<Gdk::Pixbuf>
+MotionFeedback::render_pixbuf (int size)
 {
-        GdkPixmap* pixmap = gdk_pixmap_new (0, w, h, 24);
-        GdkPixbuf* pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, 1, 8, w * 65, h);
-        GError* err = 0;
-        GdkRectangle r;
-        
-        r.x = 0;
-        r.y = 0;
-        r.width = w;
-        r.height = h;
+        Glib::RefPtr<Gdk::Pixbuf> pixbuf;
+        char path[32];
+        int fd;
 
-        set_lamp_color (Gdk::Color ("#b9feff"));
+        snprintf (path, sizeof (path), "/tmp/mfimg%dXXXXXX", size);
         
-        for (int i = 0; i < 65; ++i) {
-                cairo_t* cr = gdk_cairo_create (GDK_DRAWABLE (pixmap));
-                gdk_cairo_rectangle (cr, &r);
-                cairo_clip (cr);
-                core_draw (cr, i, h/2, w/2, h/2);
-                gdk_pixbuf_get_from_drawable (pixbuf, pixmap, gdk_colormap_get_system(), 0, 0, w*i, 0, w, h);
-                cairo_destroy (cr);
+        if ((fd = mkstemp (path)) < 0) {
+                return pixbuf;
+        }
+        
+	GdkColor col2 = {0,0,0,0};
+	GdkColor col3 = {0,0,0,0};
+        Gdk::Color base ("#b9feff");
+        GdkColor dark;
+        GdkColor bright;
+        ProlooksHSV* hsv;
+
+	hsv = prolooks_hsv_new_for_gdk_color (base.gobj());
+	bright = (prolooks_hsv_to_gdk_color (hsv, &col2), col2);
+	prolooks_hsv_set_saturation (hsv, 0.66);
+	prolooks_hsv_set_value (hsv, 0.67);
+	dark = (prolooks_hsv_to_gdk_color (hsv, &col3), col3);
+
+        cairo_surface_t *surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, size * 64, size);
+        cairo_t* cr = cairo_create (surface);
+
+        for (int i = 0; i < 64; ++i) {
+                cairo_save (cr);
+                core_draw (cr, i, size, 20, size*i, 0, &bright, &dark);
+                cairo_restore (cr);
         }
 
-        if (gdk_pixbuf_save (pixbuf, path.c_str(), "png", &err, 0)) {
-                if (err) {
-                        std::cerr << "could not save image set to " << path << ": " << err->message << std::endl;
-                }
+        if (cairo_surface_write_to_png (surface, path) != CAIRO_STATUS_SUCCESS) {
+                std::cerr << "could not save image set to " << path << std::endl;
+                return pixbuf;
         }
 
-        g_object_unref (G_OBJECT (pixbuf));
-        g_object_unref (G_OBJECT (pixmap));
-}
+        close (fd);
+
+        cairo_destroy (cr);
+        cairo_surface_destroy (surface);
+
+	try {
+		pixbuf = Gdk::Pixbuf::create_from_file (path);
+	} catch (const Gdk::PixbufError &e) {
+                std::cerr << "Caught PixbufError: " << e.what() << std::endl;
+                unlink (path);
+                throw;
+	} catch (...) {
+                unlink (path);
+		g_message("Caught ... ");
+                throw;
+	}
+
+        unlink (path);
+
+        return pixbuf;
+} 
diff --git a/libs/gtkmm2ext/prolooks_helpers.c b/libs/gtkmm2ext/prolooks_helpers.c
index 2795b29c6c..a173039d7f 100644
--- a/libs/gtkmm2ext/prolooks_helpers.c
+++ b/libs/gtkmm2ext/prolooks_helpers.c
@@ -361,7 +361,7 @@ void prolooks_color_from_string (const char* webcolor, GdkColor* result) {
 }
 
 
-char* prolooks_color_to_string (GdkColor* color) {
+char* prolooks_color_to_string (const GdkColor* color) {
 	char* result = NULL;
 	guint16 scale;
 	scale = G_MAXUINT16 / G_MAXUINT8;
@@ -380,20 +380,20 @@ CairoColor* prolooks_cairo_color_from_string (const char* webcolor) {
 }
 
 
-void prolooks_set_source_color (cairo_t* cr, GdkColor* color, double alpha) {
+void prolooks_set_source_color (cairo_t* cr, const GdkColor* color, double alpha) {
 	g_return_if_fail (cr != NULL);
 	cairo_set_source_rgba (cr, ((double) (*color).red) / ((double) G_MAXUINT16), ((double) (*color).green) / ((double) G_MAXUINT16), ((double) (*color).blue) / ((double) G_MAXUINT16), alpha);
 }
 
 
-void prolooks_gdk_color_to_cairo_color (GdkColor* color, double* red, double* green, double* blue) {
+void prolooks_gdk_color_to_cairo_color (const GdkColor* color, double* red, double* green, double* blue) {
 	*red = ((double) (*color).red) / ((double) G_MAXUINT16);
 	*green = ((double) (*color).green) / ((double) G_MAXUINT16);
 	*blue = ((double) (*color).blue) / ((double) G_MAXUINT16);
 }
 
 
-CairoColor* prolooks_gdk_color_to_cairo (GdkColor* color) {
+CairoColor* prolooks_gdk_color_to_cairo (const GdkColor* color) {
 	CairoColor* result = NULL;
 	double r;
 	double g;
@@ -428,7 +428,7 @@ void prolooks_set_source_color_string (cairo_t* cr, const char* color, double al
 }
 
 
-void prolooks_add_color_stop (cairo_pattern_t* p, double offset, GdkColor* color, double alpha) {
+void prolooks_add_color_stop (cairo_pattern_t* p, double offset, const GdkColor* color, double alpha) {
 	g_return_if_fail (p != NULL);
 	cairo_pattern_add_color_stop_rgba (p, offset, ((double) (*color).red) / ((double) G_MAXUINT16), ((double) (*color).green) / ((double) G_MAXUINT16), ((double) (*color).blue) / ((double) G_MAXUINT16), alpha);
 }
@@ -443,7 +443,7 @@ void prolooks_add_color_stop_str (cairo_pattern_t* p, double offset, const char*
 }
 
 
-cairo_pattern_t* prolooks_create_gradient (double x1, double y1, double x2, double y2, GdkColor* start, GdkColor* stop, double alpha_start, double alpha_stop) {
+cairo_pattern_t* prolooks_create_gradient (double x1, double y1, double x2, double y2, const GdkColor* start, const GdkColor* stop, double alpha_start, double alpha_stop) {
 	cairo_pattern_t* result = NULL;
 	cairo_pattern_t* gradient;
 	gradient = cairo_pattern_create_linear (x1, y1, x2, y2);
@@ -614,7 +614,7 @@ void prolooks_hsl_to_gdk_color (ProlooksHSL* self, GdkColor* result) {
 }
 
 
-void prolooks_hsl_from_gdk_color (ProlooksHSL* self, GdkColor* color) {
+void prolooks_hsl_from_gdk_color (ProlooksHSL* self, const GdkColor* color) {
 	CairoColor* _tmp0_;
 	g_return_if_fail (self != NULL);
 	prolooks_hsl_from_cairo_color (self, _tmp0_ = prolooks_gdk_color_to_cairo (color));
@@ -910,7 +910,7 @@ char* prolooks_hsv_to_string (ProlooksHSV* self) {
 }
 
 
-ProlooksHSV* prolooks_hsv_construct_for_gdk_color (GType object_type, GdkColor* color) {
+ProlooksHSV* prolooks_hsv_construct_for_gdk_color (GType object_type, const GdkColor* color) {
 	ProlooksHSV* self;
 	self = (ProlooksHSV*) g_type_create_instance (object_type);
 	prolooks_hsv_from_gdk_color (self, color);
@@ -918,7 +918,7 @@ ProlooksHSV* prolooks_hsv_construct_for_gdk_color (GType object_type, GdkColor*
 }
 
 
-ProlooksHSV* prolooks_hsv_new_for_gdk_color (GdkColor* color) {
+ProlooksHSV* prolooks_hsv_new_for_gdk_color (const GdkColor* color) {
 	return prolooks_hsv_construct_for_gdk_color (PROLOOKS_TYPE_HSV, color);
 }
 
@@ -1023,7 +1023,7 @@ void prolooks_hsv_to_gdk_color (ProlooksHSV* self, GdkColor* result) {
 }
 
 
-void prolooks_hsv_from_gdk_color (ProlooksHSV* self, GdkColor* color) {
+void prolooks_hsv_from_gdk_color (ProlooksHSV* self, const GdkColor* color) {
 	CairoColor* _tmp0_;
 	g_return_if_fail (self != NULL);
 	prolooks_hsv_from_cairo_color (self, _tmp0_ = prolooks_gdk_color_to_cairo (color));
@@ -1311,7 +1311,7 @@ void prolooks_hsv_unref (gpointer instance) {
 }
 
 
-void prolooks_shade_color (GdkColor* orig, double shade_ratio, GdkColor* result) {
+void prolooks_shade_color (const GdkColor* orig, double shade_ratio, GdkColor* result) {
 	ProlooksHSL* HSL;
 	GdkColor _tmp0_ = {0,0,0,0};
 	GdkColor _result_;
diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index 30e4400056..dc8dbff76f 100644
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -91,16 +91,6 @@ def build(bld):
         else:
                 obj.source += ['gtkapplication_x11.c']
 
-	mfimg = bld.new_task_gen(features = 'cc cxx cprogram')
-	mfimg.source = 'mfimg.cc'
-	mfimg.export_incdirs = ['.']
-	mfimg.includes     = ['.']
-	mfimg.name         = 'mfimg'
-	mfimg.target       = 'mfimg'
-	mfimg.uselib       = 'GTKMM GTK GTKOSX OSX GDK'
-	mfimg.uselib_local = 'libpbd libgtkmm2ext'
-        mfimg.ldflags = [ '-lpthread', '-lrt', '-lsndfile' ]
-
 def shutdown():
 	autowaf.shutdown()