add VU and IEC meter DSP (from jmeters)

[ardour.git] / gtk2_ardour / gtk-custom-hruler.c

diff --git a/gtk2_ardour/gtk-custom-hruler.c b/gtk2_ardour/gtk-custom-hruler.c
index 61a34a7c418a61bc7feffec1a16f3fdef3b27e64..a3745ba6919a82669b922fb6e265fd2bdee9d592 100644 (file)
--- a/gtk2_ardour/gtk-custom-hruler.c
+++ b/gtk2_ardour/gtk-custom-hruler.c
@@ -132,10 +132,9 @@ static void
 gtk_custom_hruler_draw_ticks (GtkCustomRuler * ruler)
 {
        GtkWidget *widget;
-       GdkGC *gc, *bg_gc;
+       GdkGC *gc;
        gint i;
        GtkCustomRulerMark *marks;
-       gint xthickness;
        gint ythickness;
        gint nmarks;
        gint max_chars;
@@ -152,14 +151,12 @@ gtk_custom_hruler_draw_ticks (GtkCustomRuler * ruler)
        widget = GTK_WIDGET (ruler);
 
        gc = widget->style->fg_gc[GTK_STATE_NORMAL];
-       bg_gc = widget->style->bg_gc[GTK_STATE_NORMAL];
 
        layout = gtk_widget_create_pango_layout (widget, "012456789");
        pango_layout_get_extents (layout, &ink_rect, &logical_rect);
 
        digit_offset = ink_rect.y;
 
-       xthickness = widget->style->xthickness;
        ythickness = widget->style->ythickness;
 
        gtk_paint_box (widget->style, ruler->backing_store,
@@ -251,9 +248,9 @@ gtk_custom_hruler_draw_pos (GtkCustomRuler * ruler)
                if ((bs_width > 0) && (bs_height > 0)) {
                        /*  If a backing store exists, restore the ruler  */
                        if (ruler->backing_store && ruler->non_gr_exp_gc)
-                               gdk_draw_pixmap (ruler->widget.window,
-                                                ruler->non_gr_exp_gc,
-                                                ruler->backing_store, ruler->xsrc, ruler->ysrc, ruler->xsrc, ruler->ysrc, bs_width, bs_height);
+                               gdk_draw_drawable (ruler->widget.window,
+                                                   ruler->non_gr_exp_gc,
+                                                   GDK_DRAWABLE(ruler->backing_store), ruler->xsrc, ruler->ysrc, ruler->xsrc, ruler->ysrc, bs_width, bs_height);
 
                        increment = (gfloat) width / (ruler->upper - ruler->lower);
                        x = ROUND ((ruler->position - ruler->lower) * increment) + (xthickness - bs_width) / 2 - 1;