X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmeterbridge.h;h=a1715b2633941499082b2850a72386d1fe05e1ec;hb=7ccbc0ca73055bafba07d8a5a785ca3bf1c8cb74;hp=e85e82af346e2ed38c73294a46f813029636dc0f;hpb=daca3ac45c0912ccd0618dc9bf470409f4e54bc2;p=ardour.git

diff --git a/gtk2_ardour/meterbridge.h b/gtk2_ardour/meterbridge.h
index e85e82af34..a1715b2633 100644
--- a/gtk2_ardour/meterbridge.h
+++ b/gtk2_ardour/meterbridge.h
@@ -20,6 +20,8 @@
 #ifndef __ardour_meterbridge_h__
 #define __ardour_meterbridge_h__
 
+#include <glibmm/thread.h>
+
 #include <gtkmm/box.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/label.h>
@@ -60,6 +62,8 @@ class Meterbridge :
 
 	bool _visible;
 	bool _show_busses;
+	bool _show_master;
+	bool _show_midi;
 
 	Gtk::ScrolledWindow scroller;
 	Gtk::HBox meterarea;
@@ -74,18 +78,44 @@ class Meterbridge :
 
 	void add_strips (ARDOUR::RouteList&);
 	void remove_strip (MeterStrip *);
-	void update_metrics ();
-
-	void reset_all_peaks ();
-	void reset_group_peaks (ARDOUR::RouteGroup*);
 
 	void session_going_away ();
-	void sync_order_keys (ARDOUR::RouteSortOrderKey src);
-
-	std::list<MeterStrip *> strips;
+	void sync_order_keys ();
+	void resync_order ();
+	mutable Glib::Threads::Mutex _resync_mutex;
+
+	struct MeterBridgeStrip {
+		MeterStrip *s;
+		bool visible;
+
+		MeterBridgeStrip(MeterStrip *ss) {
+			s = ss;
+			visible = true;
+		}
+	};
+
+	struct MeterOrderRouteSorter {
+		bool operator() (struct MeterBridgeStrip ma, struct MeterBridgeStrip mb) {
+			boost::shared_ptr<ARDOUR::Route> a = ma.s->route();
+			boost::shared_ptr<ARDOUR::Route> b = mb.s->route();
+			if (a->is_master() || a->is_monitor()) {
+				/* "a" is a special route (master, monitor, etc), and comes
+				 * last in the mixer ordering
+				 */
+				return false;
+			} else if (b->is_master() || b->is_monitor()) {
+				/* everything comes before b */
+				return true;
+			}
+			return a->presentation_info().order() < b->presentation_info().order();
+		}
+	};
+
+	std::list<MeterBridgeStrip> strips;
 
 	MeterStrip metrics_left;
 	MeterStrip metrics_right;
+	std::vector<MeterStrip *> _metrics;
 
 	Gtk::VBox metrics_vpacker_left;
 	Gtk::VBox metrics_vpacker_right;
@@ -94,6 +124,8 @@ class Meterbridge :
 
 	static const int32_t default_width = 600;
 	static const int32_t default_height = 400;
+	static const int max_height = 1200; // == 1024 + 148 + 16 + 12 see meter_strip.cc
+	int cur_max_width;
 
 	void update_title ();
 
@@ -105,11 +137,22 @@ class Meterbridge :
 
 	bool on_key_press_event (GdkEventKey*);
 	bool on_key_release_event (GdkEventKey*);
+	bool on_scroll_event (GdkEventScroll*);
+
+	void scroll_left ();
+	void scroll_right ();
 
 	void on_size_allocate (Gtk::Allocation&);
 	void on_size_request (Gtk::Requisition*);
 
 	void parameter_changed (std::string const & p);
+	void on_theme_changed ();
+
+	void on_scroll ();
+	sigc::connection scroll_connection;
+
+	int _mm_left, _mm_right;
+	ARDOUR::MeterType _mt_left, _mt_right;
 };
 
 #endif