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 2bfd25ecbe53d2f2ded2bd6c0f26599839dc00fb..3836ede93f88062d80aa750ef340cbfdab6ebef7 100644 (file)
--- a/gtk2_ardour/meter_strip.h
+++ b/gtk2_ardour/meter_strip.h
@@ -35,6 +35,7 @@
 
 namespace ARDOUR {
        class Route;
+       class RouteGroup;
        class Session;
 }
 namespace Gtk {
@@ -53,6 +54,13 @@ 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> 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;
@@ -60,26 +68,14 @@ class MeterStrip : public Gtk::VBox, public RouteUI
        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&);
        void on_size_request (Gtk::Requisition*);
 
-       bool peak_button_release (GdkEventButton*);
-
        /* route UI */
        void update_rec_display ();
        std::string state_id() const;
@@ -87,12 +83,14 @@ class MeterStrip : public Gtk::VBox, public RouteUI
 
   private:
        Gtk::HBox meterbox;
-       Gtk::Label label;
+       Gtk::HBox namebx;
+       ArdourButton name_label;
        Gtk::DrawingArea meter_metric_area;
        Gtk::DrawingArea meter_ticks1_area;
        Gtk::DrawingArea meter_ticks2_area;
 
        Gtk::Alignment meter_align;
+       Gtk::Alignment peak_align;
        Gtk::HBox peakbx;
        Gtk::HBox btnbox;
        ArdourButton peak_display;
@@ -100,16 +98,18 @@ class MeterStrip : public Gtk::VBox, public RouteUI
        std::vector<ARDOUR::DataType> _types;
 
        float max_peak;
+       bool _has_midi;
+
        LevelMeter   *level_meter;
        void meter_changed ();
 
-       void reset_peak_display ();
-       void reset_group_peak_display (ARDOUR::RouteGroup*);
-
        PBD::ScopedConnection _config_connection;
        void strip_property_changed (const PBD::PropertyChange&);
        void meter_configuration_changed (ARDOUR::ChanCount);
 
+       static int max_pattern_metric_size; // == FastMeter::max_pattern_metric_size
+
+       bool peak_button_release (GdkEventButton*);
 };
 
 #endif /* __ardour_mixer_strip__ */