rework meterbridge peak indicators (again)

[ardour.git] / gtk2_ardour / meter_strip.h

diff --git a/gtk2_ardour/meter_strip.h b/gtk2_ardour/meter_strip.h
index 653e045a7378f823413ba8f49e6174d05bd0ab2e..d6515e0be5e8a9efdd0e504b39f4f6bb4471efc0 100644 (file)
--- a/gtk2_ardour/meter_strip.h
+++ b/gtk2_ardour/meter_strip.h
@@ -28,6 +28,8 @@
 
 #include "ardour/types.h"
 #include "ardour/ardour.h"
+#include "route_ui.h"
+#include "ardour_button.h"
 
 #include "level_meter.h"
 
@@ -40,15 +42,15 @@ namespace Gtk {
        class Style;
 }
 
-class Meterbridge;
-
-class MeterStrip : public Gtk::VBox
+class MeterStrip : public Gtk::VBox, public RouteUI
 {
   public:
-       MeterStrip (Meterbridge&, ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>);
+       MeterStrip (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>);
+       MeterStrip (int);
        ~MeterStrip ();
 
        void fast_update ();
+       void display_metrics (bool);
        boost::shared_ptr<ARDOUR::Route> route() { return _route; }
 
        static PBD::Signal1<void,MeterStrip*> CatchDeletion;
@@ -59,25 +61,52 @@ class MeterStrip : public Gtk::VBox
        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 ();
-       bool style_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;
+       void set_button_names ();
+
   private:
+       Gtk::HBox meterbox;
        Gtk::Label label;
        Gtk::DrawingArea meter_metric_area;
+       Gtk::DrawingArea meter_ticks1_area;
+       Gtk::DrawingArea meter_ticks2_area;
+
+       Gtk::Alignment meter_align;
+       Gtk::HBox peakbx;
+       Gtk::HBox btnbox;
+       ArdourButton peak_display;
+
        std::vector<ARDOUR::DataType> _types;
 
+       float max_peak;
        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);