fix newly-appearing crash-at-close caused by muddled thinking in pbd/pthread_utils

[ardour.git] / gtk2_ardour / gain_meter.h

diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index c48d250947995367fba0a4023aa279bd9858d9a5..8286cbeb954893b8cd6abc73ca36e58277433439 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;
@@ -116,7 +117,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;
 
@@ -200,7 +201,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,
@@ -208,6 +209,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 ();
@@ -219,6 +222,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;