X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fmeter_strip.h;h=825bd6923d38ab3959947514e5e4e9fbc14de08c;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=454a3af6f1ebc65abe01900d72520a13a0e431cd;hpb=f1f84140e73f0274adfcf7fd6d2046bdfe643ef8;p=ardour.git

diff --git a/gtk2_ardour/meter_strip.h b/gtk2_ardour/meter_strip.h
index 454a3af6f1..825bd6923d 100644
--- a/gtk2_ardour/meter_strip.h
+++ b/gtk2_ardour/meter_strip.h
@@ -47,25 +47,35 @@ class MeterStrip : public Gtk::VBox, public RouteUI
 {
   public:
 	MeterStrip (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>);
-	MeterStrip (int);
+	MeterStrip (int, ARDOUR::MeterType);
 	~MeterStrip ();
 
+	void set_session (ARDOUR::Session* s);
 	void fast_update ();
 	boost::shared_ptr<ARDOUR::Route> route() { return _route; }
 
 	static PBD::Signal1<void,MeterStrip*> CatchDeletion;
 	static PBD::Signal0<void> MetricChanged;
+	static PBD::Signal0<void> ConfigurationChanged;
 
 	void reset_peak_display ();
 	void reset_route_peak_display (ARDOUR::Route*);
 	void reset_group_peak_display (ARDOUR::RouteGroup*);
 
-	void set_metric_mode (int);
+	void set_meter_type_multi (int, ARDOUR::RouteGroup*, ARDOUR::MeterType);
+
+	void set_metric_mode (int, ARDOUR::MeterType);
+	int  get_metric_mode() { return _metricmode; }
+	void set_tick_bar (int);
+	int  get_tick_bar() { return _tick_bar; }
 	bool has_midi() { return _has_midi; }
+	bool is_metric_display() { return _strip_type == 0; }
+	ARDOUR::MeterType meter_type();
 
   protected:
 	boost::shared_ptr<ARDOUR::Route> _route;
-	PBD::ScopedConnectionList route_connections;
+	PBD::ScopedConnectionList meter_route_connections;
+	PBD::ScopedConnectionList level_meter_connection;
 	void self_delete ();
 
 	gint meter_metrics_expose (GdkEventExpose *);
@@ -78,39 +88,74 @@ class MeterStrip : public Gtk::VBox, public RouteUI
 	void on_size_request (Gtk::Requisition*);
 
 	/* route UI */
-	void update_rec_display ();
+	void blink_rec_display (bool onoff);
 	std::string state_id() const;
 	void set_button_names ();
 
   private:
+	Gtk::VBox mtr_vbox;
+	Gtk::VBox nfo_vbox;
+	Gtk::EventBox mtr_container;
+	Gtk::HSeparator mtr_hsep;
 	Gtk::HBox meterbox;
+	Gtk::HBox spacer;
 	Gtk::HBox namebx;
+	Gtk::VBox namenumberbx;
 	ArdourButton name_label;
+	ArdourButton number_label;
 	Gtk::DrawingArea meter_metric_area;
 	Gtk::DrawingArea meter_ticks1_area;
 	Gtk::DrawingArea meter_ticks2_area;
 
+	Gtk::HBox mutebox;
+	Gtk::HBox solobox;
+	Gtk::HBox recbox;
+	Gtk::HBox mon_in_box;
+	Gtk::HBox mon_disk_box;
+
 	Gtk::Alignment meter_align;
 	Gtk::Alignment peak_align;
 	Gtk::HBox peakbx;
-	Gtk::HBox btnbox;
+	Gtk::VBox btnbox;
 	ArdourButton peak_display;
 
 	std::vector<ARDOUR::DataType> _types;
+	ARDOUR::MeterType metric_type;
 
 	float max_peak;
 	bool _has_midi;
+	int _tick_bar;
+	int _strip_type;
+	int _metricmode;
 
-	LevelMeter   *level_meter;
-	void meter_changed ();
+	LevelMeterHBox *level_meter;
 
-	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
+	void meter_type_changed (ARDOUR::MeterType);
+	void update_background (ARDOUR::MeterType);
 
 	bool peak_button_release (GdkEventButton*);
+
+	void parameter_changed (std::string const & p);
+	void redraw_metrics ();
+	void update_button_box ();
+	void update_name_box ();
+	void name_changed ();
+	
+	void route_color_changed ();
+
+	bool _suspend_menu_callbacks;
+	bool level_meter_button_press (GdkEventButton* ev);
+	void popup_level_meter_menu (GdkEventButton* ev);
+	void add_level_meter_type_item (Gtk::Menu_Helpers::MenuList&, Gtk::RadioMenuItem::Group&, std::string const &, ARDOUR::MeterType);
+
+	bool name_label_button_release (GdkEventButton* ev);
+	void popup_name_label_menu (GdkEventButton* ev);
+	void add_label_height_item (Gtk::Menu_Helpers::MenuList&, Gtk::RadioMenuItem::Group&, std::string const &, uint32_t);
+
+	void set_meter_type (ARDOUR::MeterType mode);
+	void set_label_height (uint32_t);
 };
 
 #endif /* __ardour_mixer_strip__ */