Prefer testing the session instead of using a global variable

[ardour.git] / gtk2_ardour / level_meter.h

diff --git a/gtk2_ardour/level_meter.h b/gtk2_ardour/level_meter.h
index 917a0089b663c216f58dff5e608eac6306df6982..f3ff2a8550f682d37a55d234a895c615befd7bab 100644 (file)
--- a/gtk2_ardour/level_meter.h
+++ b/gtk2_ardour/level_meter.h
@@ -34,10 +34,9 @@
 #include "ardour/chan_count.h"
 #include "ardour/session_handle.h"
 
-#include <gtkmm2ext/click_box.h>
-#include <gtkmm2ext/focus_entry.h>
-#include <gtkmm2ext/slider_controller.h>
-#include <gtkmm2ext/fastmeter.h>
+#include "widgets/fastmeter.h"
+#include "widgets/focus_entry.h"
+#include "widgets/slider_controller.h"
 
 #include "enums.h"
 
@@ -51,9 +50,9 @@ namespace Gtk {
 
 class LevelMeterBase : public ARDOUR::SessionHandlePtr, virtual public sigc::trackable
 {
-  public:
+public:
        LevelMeterBase (ARDOUR::Session*, PBD::EventLoop::InvalidationRecord* ir,
-                       Gtkmm2ext::FastMeter::Orientation o = Gtkmm2ext::FastMeter::Vertical);
+                       ArdourWidgets::FastMeter::Orientation o = ArdourWidgets::FastMeter::Vertical);
        virtual ~LevelMeterBase ();
 
        virtual void set_meter (ARDOUR::PeakMeter* meter);
@@ -75,23 +74,23 @@ class LevelMeterBase : public ARDOUR::SessionHandlePtr, virtual public sigc::tra
        PBD::Signal1<bool, GdkEventButton *> ButtonRelease;
        PBD::Signal1<void, ARDOUR::MeterType> MeterTypeChanged;
 
-       protected:
+protected:
        virtual void mtr_pack(Gtk::Widget &w) = 0;
        virtual void mtr_remove(Gtk::Widget &w) = 0;
 
-  private:
+private:
        PBD::EventLoop::InvalidationRecord* parent_invalidator;
        ARDOUR::PeakMeter* _meter;
-       Gtkmm2ext::FastMeter::Orientation _meter_orientation;
+       ArdourWidgets::FastMeter::Orientation _meter_orientation;
 
        Width _width;
 
        struct MeterInfo {
-               Gtkmm2ext::FastMeter *meter;
-               gint16                width;
-               int                   length;
-               bool                  packed;
-               float                 max_peak;
+               ArdourWidgets::FastMeter* meter;
+               gint16                    width;
+               int                       length;
+               bool                      packed;
+               float                     max_peak;
 
                MeterInfo() {
                        meter = 0;
@@ -131,22 +130,22 @@ class LevelMeterBase : public ARDOUR::SessionHandlePtr, virtual public sigc::tra
 
 class LevelMeterHBox : public LevelMeterBase, public Gtk::HBox
 {
-  public:
+public:
        LevelMeterHBox (ARDOUR::Session*);
        ~LevelMeterHBox();
 
-       protected:
+protected:
        void mtr_pack(Gtk::Widget &w);
        void mtr_remove(Gtk::Widget &w);
 };
 
 class LevelMeterVBox : public LevelMeterBase, public Gtk::VBox
 {
-  public:
+public:
        LevelMeterVBox (ARDOUR::Session*);
        ~LevelMeterVBox();
 
-       protected:
+protected:
        void mtr_pack(Gtk::Widget &w);
        void mtr_remove(Gtk::Widget &w);
 };