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 d23c9051b9736a170368bb235428e8c0f26e6e19..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;
@@ -114,7 +115,9 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
        Gtkmm2ext::FocusEntry        gain_display;
        Gtk::Button                  peak_display;
        Gtk::DrawingArea             meter_metric_area;
-       LevelMeter                  *level_meter;
+       Gtk::DrawingArea             meter_ticks1_area;
+       Gtk::DrawingArea             meter_ticks2_area;
+       LevelMeterHBox              *level_meter;
 
        sigc::connection gain_watching;
 
@@ -179,15 +182,11 @@ 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 ();
-       bool style_changed;
-       bool dpi_changed;
-       bool color_changed;
        void color_handler(bool);
        ARDOUR::DataType _data_type;
        ARDOUR::ChanCount _previous_amp_output_streams;
@@ -202,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,
@@ -210,24 +209,26 @@ 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 ();
 
        gint meter_metrics_expose (GdkEventExpose *);
-
-       typedef std::map<std::string,cairo_pattern_t*> MetricPatterns;
-       static  MetricPatterns metric_patterns;
-       static  cairo_pattern_t* render_metrics (Gtk::Widget &, std::vector<ARDOUR::DataType>);
+       gint meter_ticks1_expose (GdkEventExpose *);
+       gint meter_ticks2_expose (GdkEventExpose *);
 
   private:
 
        void meter_configuration_changed (ARDOUR::ChanCount);
+       void meter_type_changed (ARDOUR::MeterType);
 
        Gtk::HBox  gain_display_box;
        Gtk::HBox  fader_box;
        Gtk::VBox* fader_vbox;
        Gtk::HBox  hbox;
+       Gtk::HBox  meter_hbox;
        Gtk::Alignment fader_alignment;
        Gtk::Alignment meter_alignment;
        std::vector<ARDOUR::DataType> _types;