X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmeter_strip.h;h=3836ede93f88062d80aa750ef340cbfdab6ebef7;hb=424d368614eda4b3c34d1a0962ef641d6850fb6d;hp=653e045a7378f823413ba8f49e6174d05bd0ab2e;hpb=a4373a99c6b5869fa66244d1b72a08a34b62a87f;p=ardour.git

diff --git a/gtk2_ardour/meter_strip.h b/gtk2_ardour/meter_strip.h
index 653e045a73..3836ede93f 100644
--- a/gtk2_ardour/meter_strip.h
+++ b/gtk2_ardour/meter_strip.h
@@ -28,11 +28,14 @@
 
 #include "ardour/types.h"
 #include "ardour/ardour.h"
+#include "route_ui.h"
+#include "ardour_button.h"
 
 #include "level_meter.h"
 
 namespace ARDOUR {
 	class Route;
+	class RouteGroup;
 	class Session;
 }
 namespace Gtk {
@@ -40,18 +43,24 @@ 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 ();
 	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;
@@ -59,22 +68,38 @@ class MeterStrip : public Gtk::VBox
 	void self_delete ();
 
 	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 *);
 
 	void on_theme_changed ();
-	bool style_changed;
 
 	void on_size_allocate (Gtk::Allocation&);
 	void on_size_request (Gtk::Requisition*);
 
+	/* route UI */
+	void update_rec_display ();
+	std::string state_id() const;
+	void set_button_names ();
+
   private:
-	Gtk::Label label;
+	Gtk::HBox meterbox;
+	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;
+
 	std::vector<ARDOUR::DataType> _types;
 
+	float max_peak;
+	bool _has_midi;
+
 	LevelMeter   *level_meter;
 	void meter_changed ();
 
@@ -82,6 +107,9 @@ class MeterStrip : public Gtk::VBox
 	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__ */