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 90f6d836c3c125a504f41f97d0f62dd9482facab..1489a8cb3e5fd02eea46f727a35066c4005e396f 100644 (file)
--- a/libs/gtkmm2ext/prolooks_helpers.c
+++ b/libs/gtkmm2ext/prolooks_helpers.c
@@ -184,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;
@@ -202,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);
@@ -227,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;
 }
 
@@ -534,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;
@@ -547,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 {
@@ -771,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;
@@ -789,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);
@@ -814,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;
 }
 
@@ -944,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;
@@ -955,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);
@@ -1179,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;
@@ -1197,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);
@@ -1222,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;
 }
 
@@ -1330,15 +1333,13 @@ void prolooks_shade_color (const GdkColor* orig, double shade_ratio, GdkColor* r
 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;