diff options
| author | Doug McLain <doug@nostar.net> | 2007-11-19 21:43:20 +0000 |
|---|---|---|
| committer | Doug McLain <doug@nostar.net> | 2007-11-19 21:43:20 +0000 |
| commit | afb0c4246ea06a57d041739b26e9ae445941174e (patch) | |
| tree | cb6b9a23add203ca41fd5ec0acb20c656a55ad99 /gtk2_ardour/route_time_axis.cc | |
| parent | f265a08604a5cb9e2844c40fbae00d326db9c7fc (diff) | |
Add meters to busses too, and hide meter once again for smallest size
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2700 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/route_time_axis.cc | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 35ff60857a..7c2eec941a 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -148,11 +148,12 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh rec_enable_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::rec_enable_release)); controls_table.attach (*rec_enable_button, 4, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); ARDOUR_UI::instance()->tooltips().set_tip(*rec_enable_button, _("Record")); - controls_hbox.pack_end(gpm); - _route->meter_change.connect (mem_fun(*this, &RouteTimeAxisView::meter_changed)); } + controls_hbox.pack_end(gpm); + _route->meter_change.connect (mem_fun(*this, &RouteTimeAxisView::meter_changed)); + controls_table.attach (*mute_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); controls_table.attach (*solo_button, 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); @@ -691,7 +692,7 @@ RouteTimeAxisView::set_height (TrackHeight h) case Large: case Larger: case Normal: - show_meter(); + reset_meter(); show_name_entry (); hide_name_label (); @@ -712,7 +713,7 @@ RouteTimeAxisView::set_height (TrackHeight h) break; case Smaller: - show_meter(); + reset_meter(); show_name_entry (); hide_name_label (); @@ -1793,8 +1794,7 @@ RouteTimeAxisView::fast_update () void RouteTimeAxisView::hide_meter () { - //gpm.hide (); - gpm.clear_meters (); + gpm.hide (); } void @@ -1810,6 +1810,12 @@ RouteTimeAxisView::reset_meter () } void +RouteTimeAxisView::clear_meter () +{ + gpm.clear_meters (); +} + +void RouteTimeAxisView::meter_changed (void *src) { ENSURE_GUI_THREAD (bind (mem_fun(*this, &RouteTimeAxisView::meter_changed), src)); |