new solo safe/lock button image from oofus (a tad ugly, dare might i say)

[ardour.git] / gtk2_ardour / level_meter.h

diff --git a/gtk2_ardour/level_meter.h b/gtk2_ardour/level_meter.h
index cd2ccb7d7df612e16c72dcf26bd0480b2c42dc32..e89266a407de281b3099f3559d27c66df95441a6 100644 (file)
--- a/gtk2_ardour/level_meter.h
+++ b/gtk2_ardour/level_meter.h
@@ -31,6 +31,7 @@
 #include <gtkmm/drawingarea.h>
 
 #include "ardour/types.h"
+#include "ardour/chan_count.h"
 #include "ardour/session_handle.h"
 
 #include <gtkmm2ext/click_box.h>
@@ -74,13 +75,13 @@ class LevelMeter : public Gtk::HBox, public ARDOUR::SessionHandlePtr
        struct MeterInfo {
            Gtkmm2ext::FastMeter *meter;
            gint16                width;
-               int                               length;
+            int                          length;
            bool                  packed;
 
            MeterInfo() {
                    meter = 0;
                    width = 0;
-                       length = 0;
+                    length = 0;
                    packed = false;
            }
        };
@@ -91,7 +92,8 @@ class LevelMeter : public Gtk::HBox, public ARDOUR::SessionHandlePtr
        std::vector<MeterInfo> meters;
        float                  max_peak;
 
-       boost::signals2::scoped_connection _configuration_connection;
+       PBD::ScopedConnection _configuration_connection;
+       PBD::ScopedConnection _parameter_connection;
 
        void hide_all_meters ();
        gint meter_button_release (GdkEventButton*, uint32_t);