X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgain_meter.h;h=cd8c1b552f380e6a18b0be1e959e27ca483a8390;hb=a79fe239355b8c6f4e86da2eb1eec43c6c4dd052;hp=5517151ebb2cbb66258ec7678232af2f2bf32542;hpb=5c926136988757f1f11a14c11720ed3daac3195f;p=ardour.git

diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index 5517151ebb..cd8c1b552f 100644
--- 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"
 
@@ -39,10 +41,8 @@
 #include "ardour/session_handle.h"
 
 #include "widgets/ardour_button.h"
-
-#include "gtkmm2ext/click_box.h"
-#include "gtkmm2ext/focus_entry.h"
-#include "gtkmm2ext/slider_controller.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,14 +122,14 @@ 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;