fix initial display of name/id on meterbridge

[ardour.git] / libs / gtkmm2ext / prolooks_helpers.c

diff --git a/libs/gtkmm2ext/prolooks_helpers.c b/libs/gtkmm2ext/prolooks_helpers.c
index 2795b29c6cb2c449314cf7fdc58dbc9225a133bc..1489a8cb3e5fd02eea46f727a35066c4005e396f 100644 (file)
--- a/libs/gtkmm2ext/prolooks_helpers.c
+++ b/libs/gtkmm2ext/prolooks_helpers.c
@@ -8,6 +8,10 @@
 
 #include "gtkmm2ext/prolooks-helpers.h"
 
+static gpointer cairo_color_parent_class = NULL;
+static gpointer prolooks_hsl_parent_class = NULL;
+static gpointer prolooks_hsv_parent_class = NULL;
+
 CairoColor* cairo_color_construct (GType object_type, double red, double green, double blue, double alpha) {
        CairoColor* self;
        self = (CairoColor*) g_type_create_instance (object_type);
@@ -180,6 +184,8 @@ static gpointer cairo_value_color_peek_pointer (const GValue* value) {
 
 
 static gchar* cairo_value_color_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+       (void) n_collect_values;
+       (void) collect_flags;
        if (collect_values[0].v_pointer) {
                CairoColor* object;
                object = collect_values[0].v_pointer;
@@ -198,13 +204,14 @@ static gchar* cairo_value_color_collect_value (GValue* value, guint n_collect_va
 
 static gchar* cairo_value_color_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
        CairoColor** object_p;
+       (void) n_collect_values;
        object_p = collect_values[0].v_pointer;
        if (!object_p) {
-               return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+               return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME ((GValue*)value));
        }
        if (!value->data[0].v_pointer) {
                *object_p = NULL;
-       } else if (collect_flags && G_VALUE_NOCOPY_CONTENTS) {
+       } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
                *object_p = value->data[0].v_pointer;
        } else {
                *object_p = cairo_color_ref (value->data[0].v_pointer);
@@ -223,7 +230,7 @@ GParamSpec* cairo_param_spec_color (const gchar* name, const gchar* nick, const
 
 
 gpointer cairo_value_get_color (const GValue* value) {
-       g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CAIRO_TYPE_COLOR), NULL);
+       g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE ((GValue*)value, CAIRO_TYPE_COLOR), NULL);
        return value->data[0].v_pointer;
 }
 
@@ -262,6 +269,10 @@ void cairo_value_take_color (GValue* value, gpointer v_object) {
        }
 }
 
+static void cairo_color_finalize (CairoColor* obj) {
+       CairoColor * self;
+       self = CAIRO_COLOR (obj);
+}
 
 static void cairo_color_class_init (CairoColorClass * klass) {
        cairo_color_parent_class = g_type_class_peek_parent (klass);
@@ -276,11 +287,6 @@ static void cairo_color_instance_init (CairoColor * self) {
 }
 
 
-static void cairo_color_finalize (CairoColor* obj) {
-       CairoColor * self;
-       self = CAIRO_COLOR (obj);
-}
-
 
 GType cairo_color_get_type (void) {
        static volatile gsize cairo_color_type_id__volatile = 0;
@@ -361,7 +367,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 +386,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 +434,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 +449,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);
@@ -531,12 +537,8 @@ CairoColor* prolooks_hsl_to_cairo_color (ProlooksHSL* self) {
        CairoColor* result = NULL;
        gint i = 0;
        double* _tmp0_;
-       gint _hue_shift_size_;
-       gint hue_shift_length1;
        double* hue_shift;
        double* _tmp1_;
-       gint _color_shift_size_;
-       gint color_shift_length1;
        double* color_shift;
        double m1 = 0.0;
        double m2 = 0.0;
@@ -544,8 +546,8 @@ CairoColor* prolooks_hsl_to_cairo_color (ProlooksHSL* self) {
        gint _tmp2_ = 0;
        CairoColor* color;
        g_return_val_if_fail (self != NULL, NULL);
-       hue_shift = (_tmp0_ = g_new0 (double, 3), hue_shift_length1 = 3, _hue_shift_size_ = hue_shift_length1, _tmp0_);
-       color_shift = (_tmp1_ = g_new0 (double, 3), color_shift_length1 = 3, _color_shift_size_ = color_shift_length1, _tmp1_);
+       hue_shift = (_tmp0_ = g_new0 (double, 3), _tmp0_);
+       color_shift = (_tmp1_ = g_new0 (double, 3), _tmp1_);
        if (self->priv->_lightness <= 0.5) {
                m2 = self->priv->_lightness * (1 + self->priv->_saturation);
        } else {
@@ -614,7 +616,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));
@@ -768,6 +770,8 @@ static gpointer prolooks_value_hsl_peek_pointer (const GValue* value) {
 
 
 static gchar* prolooks_value_hsl_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+       (void) n_collect_values;
+       (void) collect_flags;
        if (collect_values[0].v_pointer) {
                ProlooksHSL* object;
                object = collect_values[0].v_pointer;
@@ -786,13 +790,14 @@ static gchar* prolooks_value_hsl_collect_value (GValue* value, guint n_collect_v
 
 static gchar* prolooks_value_hsl_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
        ProlooksHSL** object_p;
+       (void) n_collect_values;
        object_p = collect_values[0].v_pointer;
        if (!object_p) {
-               return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+               return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME ((GValue*)value));
        }
        if (!value->data[0].v_pointer) {
                *object_p = NULL;
-       } else if (collect_flags && G_VALUE_NOCOPY_CONTENTS) {
+       } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
                *object_p = value->data[0].v_pointer;
        } else {
                *object_p = prolooks_hsl_ref (value->data[0].v_pointer);
@@ -811,7 +816,7 @@ GParamSpec* prolooks_param_spec_hsl (const gchar* name, const gchar* nick, const
 
 
 gpointer prolooks_value_get_hsl (const GValue* value) {
-       g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PROLOOKS_TYPE_HSL), NULL);
+       g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE ((GValue*)value, PROLOOKS_TYPE_HSL), NULL);
        return value->data[0].v_pointer;
 }
 
@@ -850,6 +855,10 @@ void prolooks_value_take_hsl (GValue* value, gpointer v_object) {
        }
 }
 
+static void prolooks_hsl_finalize (ProlooksHSL* obj) {
+       ProlooksHSL * self;
+       self = PROLOOKS_HSL (obj);
+}
 
 static void prolooks_hsl_class_init (ProlooksHSLClass * klass) {
        prolooks_hsl_parent_class = g_type_class_peek_parent (klass);
@@ -864,11 +873,6 @@ static void prolooks_hsl_instance_init (ProlooksHSL * self) {
 }
 
 
-static void prolooks_hsl_finalize (ProlooksHSL* obj) {
-       ProlooksHSL * self;
-       self = PROLOOKS_HSL (obj);
-}
-
 
 GType prolooks_hsl_get_type (void) {
        static volatile gsize prolooks_hsl_type_id__volatile = 0;
@@ -910,7 +914,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 +922,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);
 }
 
@@ -942,7 +946,6 @@ CairoColor* prolooks_hsv_to_cairo_color (ProlooksHSV* self) {
        double r;
        double g;
        double b;
-       double v;
        gint hi = 0;
        double f = 0.0;
        double p = 0.0;
@@ -953,7 +956,6 @@ CairoColor* prolooks_hsv_to_cairo_color (ProlooksHSV* self) {
        r = 0.0;
        g = 0.0;
        b = 0.0;
-       v = self->priv->_value;
        hi = (gint) prolooks_modula (floor (self->priv->_hue / 60.0), (double) 6);
        f = (self->priv->_hue / 60.0) - floor (self->priv->_hue / 60.0);
        p = self->priv->_value * (1.0 - self->priv->_saturation);
@@ -1023,7 +1025,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));
@@ -1177,6 +1179,8 @@ static gpointer prolooks_value_hsv_peek_pointer (const GValue* value) {
 
 
 static gchar* prolooks_value_hsv_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+       (void) collect_flags;
+       (void) n_collect_values;
        if (collect_values[0].v_pointer) {
                ProlooksHSV* object;
                object = collect_values[0].v_pointer;
@@ -1195,13 +1199,14 @@ static gchar* prolooks_value_hsv_collect_value (GValue* value, guint n_collect_v
 
 static gchar* prolooks_value_hsv_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
        ProlooksHSV** object_p;
+       (void) n_collect_values;
        object_p = collect_values[0].v_pointer;
        if (!object_p) {
-               return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+               return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME ((GValue*)value));
        }
        if (!value->data[0].v_pointer) {
                *object_p = NULL;
-       } else if (collect_flags && G_VALUE_NOCOPY_CONTENTS) {
+       } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
                *object_p = value->data[0].v_pointer;
        } else {
                *object_p = prolooks_hsv_ref (value->data[0].v_pointer);
@@ -1220,7 +1225,7 @@ GParamSpec* prolooks_param_spec_hsv (const gchar* name, const gchar* nick, const
 
 
 gpointer prolooks_value_get_hsv (const GValue* value) {
-       g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PROLOOKS_TYPE_HSV), NULL);
+       g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE ((GValue*) value, PROLOOKS_TYPE_HSV), NULL);
        return value->data[0].v_pointer;
 }
 
@@ -1259,6 +1264,10 @@ void prolooks_value_take_hsv (GValue* value, gpointer v_object) {
        }
 }
 
+static void prolooks_hsv_finalize (ProlooksHSV* obj) {
+       ProlooksHSV * self;
+       self = PROLOOKS_HSV (obj);
+}
 
 static void prolooks_hsv_class_init (ProlooksHSVClass * klass) {
        prolooks_hsv_parent_class = g_type_class_peek_parent (klass);
@@ -1272,13 +1281,6 @@ static void prolooks_hsv_instance_init (ProlooksHSV * self) {
        self->ref_count = 1;
 }
 
-
-static void prolooks_hsv_finalize (ProlooksHSV* obj) {
-       ProlooksHSV * self;
-       self = PROLOOKS_HSV (obj);
-}
-
-
 GType prolooks_hsv_get_type (void) {
        static volatile gsize prolooks_hsv_type_id__volatile = 0;
        if (g_once_init_enter (&prolooks_hsv_type_id__volatile)) {
@@ -1311,7 +1313,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_;
@@ -1331,15 +1333,13 @@ void prolooks_shade_color (GdkColor* orig, double shade_ratio, GdkColor* result)
 GdkPixbuf* prolooks_cairo_image_surface_to_pixbuf (cairo_surface_t* surface) {
        GdkPixbuf* result = NULL;
        guchar* _tmp0_;
-       gint _knob_data_size_;
-       gint knob_data_length1;
        guchar* knob_data;
        g_return_val_if_fail (surface != NULL, NULL);
        if (cairo_image_surface_get_format (surface) != CAIRO_FORMAT_ARGB32) {
                result = NULL;
                return result;
        }
-       knob_data = (_tmp0_ = cairo_image_surface_get_data (surface), knob_data_length1 = -1, _knob_data_size_ = knob_data_length1, _tmp0_);
+       knob_data = (_tmp0_ = cairo_image_surface_get_data (surface), _tmp0_);
        {
                gint i;
                i = 0;