shared peak-display reset in mixer+meterbridge

[ardour.git] / gtk2_ardour / meter_strip.h

diff --git a/gtk2_ardour/meter_strip.h b/gtk2_ardour/meter_strip.h
index cfd95a4c3b13061e7c73f8a3a352de39178e197f..3836ede93f88062d80aa750ef340cbfdab6ebef7 100644 (file)
--- a/gtk2_ardour/meter_strip.h
+++ b/gtk2_ardour/meter_strip.h
@@ -54,31 +54,23 @@ class MeterStrip : public Gtk::VBox, public RouteUI
        boost::shared_ptr<ARDOUR::Route> route() { return _route; }
 
        static PBD::Signal1<void,MeterStrip*> CatchDeletion;
-       static PBD::Signal0<void> ResetAllPeakDisplays;
-       static PBD::Signal1<void,ARDOUR::RouteGroup*> ResetGroupPeakDisplays;
+       static PBD::Signal0<void> MetricChanged;
 
        void reset_peak_display ();
        void reset_group_peak_display (ARDOUR::RouteGroup*);
 
+       void set_metric_mode (int);
+       bool has_midi() { return _has_midi; }
+
   protected:
        boost::shared_ptr<ARDOUR::Route> _route;
        PBD::ScopedConnectionList route_connections;
        void self_delete ();
 
        gint meter_metrics_expose (GdkEventExpose *);
-       gint meter_ticks_expose (GdkEventExpose *, Gtk::DrawingArea *);
        gint meter_ticks1_expose (GdkEventExpose *);
        gint meter_ticks2_expose (GdkEventExpose *);
 
-       typedef std::map<std::string,cairo_pattern_t*> MetricPatterns;
-       static  MetricPatterns metric_patterns;
-
-       typedef std::map<std::string,cairo_pattern_t*> TickPatterns;
-       static  TickPatterns ticks_patterns;
-
-       static  cairo_pattern_t* render_metrics (Gtk::Widget &, std::vector<ARDOUR::DataType>);
-       static  cairo_pattern_t* render_ticks (Gtk::Widget &, std::vector<ARDOUR::DataType>);
-
        void on_theme_changed ();
 
        void on_size_allocate (Gtk::Allocation&);
@@ -106,6 +98,8 @@ class MeterStrip : public Gtk::VBox, public RouteUI
        std::vector<ARDOUR::DataType> _types;
 
        float max_peak;
+       bool _has_midi;
+
        LevelMeter   *level_meter;
        void meter_changed ();