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

diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc
index 007b1386a1879371c772d0c8f54120775b5374ae..061fa324e51bf849ee92dcd620aadf1882504961 100644 (file)
--- a/gtk2_ardour/editor_audiotrack.cc
+++ b/gtk2_ardour/editor_audiotrack.cc
@@ -102,7 +102,7 @@ Editor::start_updating ()
        if (is_mapped() && session) {
                for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
                        if ((atv = dynamic_cast<AudioTimeAxisView*>(*i)) != 0) {
-                               atv->show_meter ();
+                               atv->reset_meter ();
                        }
                }
        }
@@ -125,7 +125,7 @@ Editor::stop_updating ()
        if (is_mapped() && session) {
                for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
                        if ((atv = dynamic_cast<AudioTimeAxisView*>(*i)) != 0) {
-                               atv->hide_meter ();
+                               atv->clear_meter ();
                        }
                }
        }

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 35ff60857a6a864d76dea6aa6c4b2825f5e02550..7c2eec941a52406d683c94e11ee7ab572638ae69 100644 (file)
--- 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
@@ -1809,6 +1809,12 @@ RouteTimeAxisView::reset_meter ()
        gpm.setup_atv_meter (height-5);
 }
 
+void
+RouteTimeAxisView::clear_meter ()
+{
+       gpm.clear_meters ();
+}
+
 void
 RouteTimeAxisView::meter_changed (void *src)
 {

diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index c2c1f02ee543c19a72395919e4ea780f23b0e76b..93e6b2035a3b609d291488e20e254727e986209c 100644 (file)
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -104,6 +104,7 @@ public:
        void hide_meter ();
        void show_meter ();
        void reset_meter ();
+       void clear_meter ();
        void meter_changed (void *);
 
 protected: