From 0bc8507bfb92a79b4357fcec446231f23a16cc7f Mon Sep 17 00:00:00 2001 From: Hans Baier Date: Mon, 2 Mar 2009 17:17:17 +0700 Subject: [PATCH] * Display: callbacks for buffer size and sample rate, removed debug rectangles --- jackpanel/Display.vala | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/jackpanel/Display.vala b/jackpanel/Display.vala index 1f0b96a..b729414 100644 --- a/jackpanel/Display.vala +++ b/jackpanel/Display.vala @@ -56,6 +56,17 @@ public class Display : DisplayBase { } } + private void buffer_size_changed (uint32 new_size) { + stderr.printf ("buffersize-activate: %u\n", (uint)new_size); + + } + + private void sample_rate_changed (uint32 new_size) { + stderr.printf ("samplerate-activate: %u\n", (uint)new_size); + + } + + public Display () { uint[] sample_rates = { 22050, 32000, 44100, 48000, 96000, 192000 }; @@ -63,7 +74,8 @@ public class Display : DisplayBase { for (int i = 0; i < sample_rates.length; i++) { var item = new MenuItem.with_label ("%u".printf (sample_rates[i])); item.activate += (item) => { - stderr.printf ("srate-activate\n"); + string size_str = ((Gtk.Label)((Gtk.Item)item).get_child ()).get_text(); + sample_rate_changed ((uint32) size_str.to_ulong ()); }; sample_rate_menu.append (item); @@ -73,7 +85,12 @@ public class Display : DisplayBase { buffer_size_menu = new Menu (); for (int i = 0; i < buffer_sizes.length; i++) { - buffer_size_menu.append (new MenuItem.with_label ("%u".printf (buffer_sizes[i]))); + var item = new MenuItem.with_label ("%u".printf (buffer_sizes[i])); + item.activate += (item) => { + string size_str = ((Gtk.Label)((Gtk.Item)item).get_child ()).get_text(); + buffer_size_changed ((uint32) size_str.to_ulong ()); + }; + buffer_size_menu.append (item); } width = 182; @@ -175,11 +192,6 @@ public class Display : DisplayBase { buffer_size_h = ext.height; text (cr, buffer_size_str, buffer_size_x, y_text_below, smaller_font_size); draw_popup_triangle (cr, buffer_size_x + ext.x_advance + ext.x_bearing + 1.0, y_popup_triangle); - - // debug - set_source_from_color_string (cr, "#ff0000"); - cr.rectangle (buffer_size_x, buffer_size_y, buffer_size_w, buffer_size_h); - cr.stroke (); // samplerate string samplerate_str = "%u".printf (samplerate); @@ -192,11 +204,6 @@ public class Display : DisplayBase { text (cr, samplerate_str, sample_rate_x, y_text_below, smaller_font_size); draw_popup_triangle (cr, inner_width - popup_triangle_width () - padding, y_popup_triangle); - // debug - set_source_from_color_string (cr, "#ff0000"); - cr.rectangle (sample_rate_x, sample_rate_y, sample_rate_w, sample_rate_h); - cr.stroke (); - return false; } -- 2.11.4.GIT