Change order of midi entries so a new backend will default to a working midi system.

[ardour.git] / gtk2_ardour / level_meter.cc

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index 35a4dd8f31327b4ad98f5e97256869b958915099..efa98bb43427c7b065943637be3749889b806349 100644 (file)
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -49,20 +49,15 @@ LevelMeterBase::LevelMeterBase (Session* s, PBD::EventLoop::InvalidationRecord*
        , regular_meter_width (6)
        , meter_length (0)
        , thin_meter_width(2)
+       , max_peak (minus_infinity())
+       , meter_type (MeterPeak)
+       , color_changed (false)
 {
        set_session (s);
+
        Config->ParameterChanged.connect (_parameter_connection, parent_invalidator, boost::bind (&LevelMeterBase::parameter_changed, this, _1), gui_context());
        ARDOUR_UI::config()->ParameterChanged.connect (sigc::mem_fun(*this, &LevelMeterBase::parameter_changed));
-       UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &LevelMeterBase::on_theme_changed));
        ColorsChanged.connect (sigc::mem_fun (*this, &LevelMeterBase::color_handler));
-       max_peak = minus_infinity();
-       meter_type = MeterPeak;
-}
-
-void
-LevelMeterBase::on_theme_changed()
-{
-       style_changed = true;
 }
 
 LevelMeterBase::~LevelMeterBase ()
@@ -239,6 +234,8 @@ LevelMeterBase::hide_all_meters ()
 void
 LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
 {
+       hide_all_meters ();
+
        if (!_meter) {
                return; /* do it later or never */
        }
@@ -398,13 +395,8 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
                }
                if (meters[n].width != width || meters[n].length != len || color_changed || meter_type != visible_meter_type) {
                        bool hl = meters[n].meter ? meters[n].meter->get_highlight() : false;
-
-                       if (meters[n].meter && meters[n].meter->get_parent()) {
-                               mtr_remove (*meters[n].meter);
-                               meters[n].packed = false;
-                               delete meters[n].meter;
-                       }
-
+                       meters[n].packed = false;
+                       delete meters[n].meter;
                        meters[n].meter = new FastMeter ((uint32_t) floor (ARDOUR_UI::config()->get_meter_hold()), width, _meter_orientation, len,
                                        c[0], c[1], c[2], c[3], c[4],
                                        c[5], c[6], c[7], c[8], c[9],
@@ -418,13 +410,14 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
                        meters[n].meter->add_events (Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK);
                        meters[n].meter->signal_button_press_event().connect (sigc::mem_fun (*this, &LevelMeterBase::meter_button_press), false);
                        meters[n].meter->signal_button_release_event().connect (sigc::mem_fun (*this, &LevelMeterBase::meter_button_release), false);
-
-                       mtr_pack (*meters[n].meter);
-                       meters[n].meter->show_all ();
-                       meters[n].packed = true;
                }
-       }
 
+               //pack_end (*meters[n].meter, false, false);
+               mtr_pack (*meters[n].meter);
+               meters[n].meter->show_all ();
+               meters[n].packed = true;
+       }
+       //show();
        color_changed = false;
        visible_meter_type = meter_type;
 }