Remove 'pipex' from my pbd.vcproj as it's not needed for Ardour3

[ardour.git] / gtk2_ardour / gain_meter.h

diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index 8a4613be5a2f043d54ad6ee35f2b9b930606838b..b71469b4c685cbb24f5363f9a4e9df567d562b80 100644 (file)
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -85,10 +85,11 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
        void set_flat_buttons ();
 
        virtual void setup_meters (int len=0);
+       virtual void set_type (ARDOUR::MeterType);
 
        boost::shared_ptr<PBD::Controllable> get_controllable();
 
-       LevelMeter& get_level_meter() const { return *level_meter; }
+       LevelMeterHBox& get_level_meter() const { return *level_meter; }
        Gtkmm2ext::SliderController& get_gain_slider() const { return *gain_slider; }
 
        /** Emitted in the GUI thread when a button is pressed over the level meter;
@@ -100,6 +101,7 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
 
        friend class MixerStrip;
        friend class MeterStrip;
+       friend class RouteTimeAxisView;
        boost::shared_ptr<ARDOUR::Route> _route;
        boost::shared_ptr<ARDOUR::PeakMeter> _meter;
        boost::shared_ptr<ARDOUR::Amp> _amp;
@@ -116,7 +118,7 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
        Gtk::DrawingArea             meter_metric_area;
        Gtk::DrawingArea             meter_ticks1_area;
        Gtk::DrawingArea             meter_ticks2_area;
-       LevelMeter                  *level_meter;
+       LevelMeterHBox              *level_meter;
 
        sigc::connection gain_watching;
 
@@ -181,11 +183,10 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
        void parameter_changed (const char*);
 
        void reset_peak_display ();
+       void reset_route_peak_display (ARDOUR::Route*);
        void reset_group_peak_display (ARDOUR::RouteGroup*);
 
-       static sigc::signal<void> ResetAllPeakDisplays;
-       static sigc::signal<void,ARDOUR::RouteGroup*> ResetGroupPeakDisplays;
-
+       void redraw_metrics ();
        void on_theme_changed ();
        void color_handler(bool);
        ARDOUR::DataType _data_type;
@@ -201,7 +202,7 @@ class GainMeter : public GainMeterBase, public Gtk::VBox
 {
   public:
          GainMeter (ARDOUR::Session*, int);
-       ~GainMeter () {}
+       virtual ~GainMeter ();
 
        virtual void set_controls (boost::shared_ptr<ARDOUR::Route> route,
                                   boost::shared_ptr<ARDOUR::PeakMeter> meter,
@@ -209,6 +210,8 @@ class GainMeter : public GainMeterBase, public Gtk::VBox
 
        int get_gm_width ();
        void setup_meters (int len=0);
+       void set_type (ARDOUR::MeterType);
+       void route_active_changed ();
 
   protected:
        void hide_all_meters ();
@@ -220,6 +223,7 @@ class GainMeter : public GainMeterBase, public Gtk::VBox
   private:
 
        void meter_configuration_changed (ARDOUR::ChanCount);
+       void meter_type_changed (ARDOUR::MeterType);
 
        Gtk::HBox  gain_display_box;
        Gtk::HBox  fader_box;