Allow to limit strip-inline controls (GUI optimization)

[ardour.git] / gtk2_ardour / gain_meter.h

diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index 943fe36ae4459bd207693c20dc7bd1e8ac9a292e..cd8c1b552f380e6a18b0be1e959e27ca483a8390 100644 (file)
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -23,14 +23,16 @@
 #include <vector>
 #include <map>
 
-#include <gtkmm/box.h>
 #include <gtkmm/adjustment.h>
-#include <gtkmm/frame.h>
-#include <gtkmm/eventbox.h>
+#include <gtkmm/alignment.h>
+#include <gtkmm/box.h>
 #include <gtkmm/button.h>
-#include <gtkmm/table.h>
 #include <gtkmm/drawingarea.h>
-#include <gdkmm/colormap.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/table.h>
+
+//#include <gdkmm/colormap.h>
 
 #include "pbd/signals.h"
 
@@ -38,11 +40,9 @@
 #include "ardour/types.h"
 #include "ardour/session_handle.h"
 
-#include "ardour_button.h"
-
-#include "gtkmm2ext/click_box.h"
-#include "gtkmm2ext/focus_entry.h"
-#include "gtkmm2ext/slider_controller.h"
+#include "widgets/ardour_button.h"
+#include "widgets/focus_entry.h"
+#include "widgets/slider_controller.h"
 
 #include "enums.h"
 #include "level_meter.h"
@@ -57,9 +57,7 @@ namespace ARDOUR {
        class Amp;
        class Automatable;
 }
-namespace Gtkmm2ext {
-       class FastMeter;
-}
+
 namespace Gtk {
        class Menu;
 }
@@ -97,7 +95,7 @@ public:
        boost::shared_ptr<PBD::Controllable> get_controllable();
 
        LevelMeterHBox& get_level_meter() const { return *level_meter; }
-       Gtkmm2ext::SliderController& get_gain_slider() const { return *gain_slider; }
+       ArdourWidgets::SliderController& get_gain_slider() const { return *gain_slider; }
 
        /** Emitted in the GUI thread when a button is pressed over the level meter;
         *  return true if the event is handled.
@@ -113,6 +111,7 @@ protected:
        friend class MixerStrip;
        friend class MeterStrip;
        friend class RouteTimeAxisView;
+       friend class VCAMasterStrip;
        boost::shared_ptr<ARDOUR::Route> _route;
        boost::shared_ptr<ARDOUR::PeakMeter> _meter;
        boost::shared_ptr<ARDOUR::Amp> _amp;
@@ -123,22 +122,22 @@ protected:
        bool ignore_toggle;
        bool next_release_selects;
 
-       Gtkmm2ext::SliderController *gain_slider;
-       Gtk::Adjustment              gain_adjustment;
-       Gtkmm2ext::FocusEntry        gain_display;
-       Gtkmm2ext::FocusEntry        peak_display;
-       Gtk::DrawingArea             meter_metric_area;
-       Gtk::DrawingArea             meter_ticks1_area;
-       Gtk::DrawingArea             meter_ticks2_area;
-       LevelMeterHBox              *level_meter;
+       ArdourWidgets::SliderController* gain_slider;
+       Gtk::Adjustment                  gain_adjustment;
+       ArdourWidgets::FocusEntry        gain_display;
+       ArdourWidgets::FocusEntry        peak_display;
+       Gtk::DrawingArea                 meter_metric_area;
+       Gtk::DrawingArea                 meter_ticks1_area;
+       Gtk::DrawingArea                 meter_ticks2_area;
+       LevelMeterHBox*                  level_meter;
 
        sigc::connection gain_watching;
 
-       ArdourButton gain_automation_state_button;
+       ArdourWidgets::ArdourButton gain_automation_state_button;
 
        Gtk::Menu gain_astate_menu;
 
-       ArdourButton meter_point_button;
+       ArdourWidgets::ArdourButton meter_point_button;
 
        Gtk::Menu meter_point_menu;