X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fmeterbridge.cc;h=65438c414e9db19a025e60ba9d32dfeb3c35fcde;hb=5524bac04bc7f4901991bd1fb4747abcb7b43db4;hp=24b21656d165f29d410915474fc80b22dc242bef;hpb=2106a12edd6dcdf1189b7cfd68b07a0761d77c46;p=ardour.git

diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc
index 24b21656d1..65438c414e 100644
--- a/gtk2_ardour/meterbridge.cc
+++ b/gtk2_ardour/meterbridge.cc
@@ -51,17 +51,19 @@
 #include "route_sorter.h"
 #include "actions.h"
 #include "gui_thread.h"
-#include "global_signals.h"
 #include "meter_patterns.h"
+#include "timers.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
 using namespace Glib;
 using namespace Gtkmm2ext;
 using namespace std;
+using namespace ArdourMeter;
 
 using PBD::atoi;
 
@@ -77,31 +79,13 @@ Meterbridge::instance ()
 	return _instance;
 }
 
-/* copy from gtk2_ardour/mixer_ui.cc -- TODO consolidate
- * used by Meterbridge::set_session() below
- */
-struct SignalOrderRouteSorter {
-	bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
-		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->order_key (MixerSort) < b->order_key (MixerSort);
-	}
-};
-
 Meterbridge::Meterbridge ()
 	: Window (Gtk::WINDOW_TOPLEVEL)
 	, VisibilityTracker (*((Gtk::Window*) this))
 	, _visible (false)
 	, _show_busses (false)
-	, metrics_left (1)
-	, metrics_right (2)
+	, metrics_left (1, MeterPeak)
+	, metrics_right (2, MeterPeak)
 	, cur_max_width (-1)
 {
 	set_name ("Meter Bridge");
@@ -115,14 +99,26 @@ Meterbridge::Meterbridge ()
 
 	set_wmclass (X_("ardour_mixer"), PROGRAM_NAME);
 
+#ifdef __APPLE__
+	set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
+#else
+	if (UIConfiguration::instance().get_all_floating_windows_are_dialogs()) {
+		set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
+	} else {
+		set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
+	}
+#endif
+
 	Gdk::Geometry geom;
 	geom.max_width = 1<<16;
 	geom.max_height = max_height;
+	geom.min_width = 40;
+	geom.min_height = -1;
 	geom.height_inc = 16;
 	geom.width_inc = 1;
-	set_geometry_hints(*((Gtk::Window*) this), geom, Gdk::HINT_MAX_SIZE | Gdk::HINT_RESIZE_INC);
+	assert(max_height % 16 == 0);
+	set_geometry_hints(*((Gtk::Window*) this), geom, Gdk::HINT_MIN_SIZE | Gdk::HINT_MAX_SIZE | Gdk::HINT_RESIZE_INC);
 
-	set_keep_above (true);
 	set_border_width (0);
 
 	metrics_vpacker_left.pack_start (metrics_left, true, true);
@@ -137,9 +133,9 @@ Meterbridge::Meterbridge ()
 
 	signal_delete_event().connect (sigc::mem_fun (*this, &Meterbridge::hide_window));
 	signal_configure_event().connect (sigc::mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
-	Route::SyncOrderKeys.connect (*this, invalidator (*this), boost::bind (&Meterbridge::sync_order_keys, this, _1), gui_context());
 	MeterStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Meterbridge::remove_strip, this, _1), gui_context());
-	MeterStrip::MetricChanged.connect_same_thread (*this, boost::bind(&Meterbridge::update_metrics, this));
+	MeterStrip::MetricChanged.connect (*this, invalidator (*this), boost::bind(&Meterbridge::resync_order, this), gui_context());
+	MeterStrip::ConfigurationChanged.connect (*this, invalidator (*this), boost::bind(&Meterbridge::queue_resize, this), gui_context());
 
 	/* work around ScrolledWindowViewport alignment mess Part one */
 	Gtk::HBox * yspc = manage (new Gtk::HBox());
@@ -185,12 +181,16 @@ Meterbridge::Meterbridge ()
 	viewport->set_border_width(0);
 
 	UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &Meterbridge::on_theme_changed));
-	ColorsChanged.connect (sigc::mem_fun (*this, &Meterbridge::on_theme_changed));
-	DPIReset.connect (sigc::mem_fun (*this, &Meterbridge::on_theme_changed));
+	UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &Meterbridge::on_theme_changed));
+	UIConfiguration::instance().DPIReset.connect (sigc::mem_fun (*this, &Meterbridge::on_theme_changed));
 }
 
 Meterbridge::~Meterbridge ()
 {
+	while (_metrics.size() > 0) {
+		delete (_metrics.back());
+		_metrics.pop_back();
+	}
 }
 
 void
@@ -264,7 +264,7 @@ Meterbridge::on_key_press_event (GdkEventKey* ev)
 	if (gtk_window_propagate_key_event (GTK_WINDOW(gobj()), ev)) {
 		return true;
 	}
-	return forward_key_press (ev);
+	return relay_key_press (ev, this);
 }
 
 bool
@@ -331,14 +331,21 @@ Meterbridge::on_size_request (Gtk::Requisition* r)
 	Gtk::Window::on_size_request(r);
 
 	Gdk::Geometry geom;
-	geom.max_width = meterarea.get_width() + metrics_left.get_width() + metrics_right.get_width();
+	Gtk::Requisition mr = meterarea.size_request();
+
+	geom.max_width = mr.width + metrics_left.get_width() + metrics_right.get_width();
+	geom.max_width = std::max(50, geom.max_width);
 	geom.max_height = max_height;
 
 	if (cur_max_width != geom.max_width) {
 		cur_max_width = geom.max_width;
+		/* height resizes are 'heavy' since the metric areas and meter-patterns
+		 * are re-generated. limit to 16px steps. */
 		geom.height_inc = 16;
 		geom.width_inc = 1;
-		set_geometry_hints(*((Gtk::Window*) this), geom, Gdk::HINT_MAX_SIZE | Gdk::HINT_RESIZE_INC);
+		geom.min_width = 40;
+		geom.min_height = -1;
+		set_geometry_hints(*((Gtk::Window*) this), geom, Gdk::HINT_MIN_SIZE | Gdk::HINT_MAX_SIZE | Gdk::HINT_RESIZE_INC);
 	}
 }
 
@@ -347,7 +354,12 @@ Meterbridge::on_size_allocate (Gtk::Allocation& a)
 {
 	const Gtk::Scrollbar * hsc = scroller.get_hscrollbar();
 
+	/* switch left/right edge patterns depending on horizontal scroll-position */
 	if (scroller.get_hscrollbar_visible() && hsc) {
+		if (!scroll_connection.connected()) {
+			scroll_connection = scroller.get_hscrollbar()->get_adjustment()->signal_value_changed().connect(sigc::mem_fun (*this, &Meterbridge::on_scroll));
+			scroller.get_hscrollbar()->get_adjustment()->signal_changed().connect(sigc::mem_fun (*this, &Meterbridge::on_scroll));
+		}
 		gint scrollbar_spacing;
 		gtk_widget_style_get (GTK_WIDGET (scroller.gobj()),
 				"scrollbar-spacing", &scrollbar_spacing, NULL);
@@ -361,6 +373,57 @@ Meterbridge::on_size_allocate (Gtk::Allocation& a)
 	Gtk::Window::on_size_allocate(a);
 }
 
+void
+Meterbridge::on_scroll()
+{
+	if (!scroller.get_hscrollbar()) return;
+
+	Adjustment* adj = scroller.get_hscrollbar()->get_adjustment();
+	int leftend = adj->get_value();
+	int rightend = scroller.get_width() + leftend;
+
+	int mm_left = _mm_left;
+	int mm_right = _mm_right;
+	ARDOUR::MeterType mt_left = _mt_left;
+	ARDOUR::MeterType mt_right = _mt_right;
+
+	for (unsigned int i = 0; i < _metrics.size(); ++i) {
+		int sx, dx = 0, dy = 0;
+		int mm = _metrics[i]->get_metric_mode();
+		sx = (mm & 2) ? _metrics[i]->get_width() : 0;
+
+		_metrics[i]->translate_coordinates(meterarea, sx, 0, dx, dy);
+
+		if (dx < leftend && !(mm&2)) {
+			mm_left = mm;
+			mt_left = _metrics[i]->meter_type();
+		}
+		if (dx > rightend && (mm&2)) {
+			mm_right = mm;
+			mt_right = _metrics[i]->meter_type();
+			break;
+		}
+	}
+	metrics_left.set_metric_mode(mm_left, mt_left);
+	metrics_right.set_metric_mode(mm_right, mt_right);
+}
+
+struct PresentationInfoRouteSorter
+{
+	bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
+		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();
+	}
+};
+
 void
 Meterbridge::set_session (Session* s)
 {
@@ -383,12 +446,11 @@ Meterbridge::set_session (Session* s)
 	_show_master = _session->config.get_show_master_on_meterbridge();
 	_show_midi = _session->config.get_show_midi_on_meterbridge();
 
-	SignalOrderRouteSorter sorter;
 	boost::shared_ptr<RouteList> routes = _session->get_routes();
 
-	RouteList copy(*routes);
-	copy.sort(sorter);
-	add_strips(copy);
+	RouteList copy (*routes);
+	copy.sort (PresentationInfoRouteSorter());
+	add_strips (copy);
 
 	_session->RouteAdded.connect (_session_connections, invalidator (*this), boost::bind (&Meterbridge::add_strips, this, _1), gui_context());
 	_session->DirtyChanged.connect (_session_connections, invalidator (*this), boost::bind (&Meterbridge::update_title, this), gui_context());
@@ -398,7 +460,7 @@ Meterbridge::set_session (Session* s)
 
 	if (_visible) {
 		show_window();
-		ActionManager::check_toggleaction ("<Actions>/Common/toggle-meterbridge");
+		present ();
 	}
 	start_updating ();
 }
@@ -424,7 +486,7 @@ Meterbridge::session_going_away ()
 int
 Meterbridge::set_state (const XMLNode& node)
 {
-	const XMLProperty* prop;
+	XMLProperty const * prop;
 	XMLNode* geometry;
 
 	m_width = default_width;
@@ -434,7 +496,7 @@ Meterbridge::set_state (const XMLNode& node)
 
 	if ((geometry = find_named_node (node, "geometry")) != 0) {
 
-		XMLProperty* prop;
+		XMLProperty const * prop;
 
 		if ((prop = geometry->property("x_size")) == 0) {
 			prop = geometry->property ("x-size");
@@ -504,7 +566,7 @@ Meterbridge::get_state (void)
 gint
 Meterbridge::start_updating ()
 {
-	fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (sigc::mem_fun(*this, &Meterbridge::fast_update_strips));
+	fast_screen_update_connection = Timers::super_rapid_connect (sigc::mem_fun(*this, &Meterbridge::fast_update_strips));
 	return 0;
 }
 
@@ -549,7 +611,6 @@ Meterbridge::add_strips (RouteList& routes)
 	}
 
 	resync_order();
-	update_metrics();
 }
 
 void
@@ -566,28 +627,12 @@ Meterbridge::remove_strip (MeterStrip* strip)
 			break;
 		}
 	}
-	update_metrics();
-}
 
-void
-Meterbridge::update_metrics ()
-{
-	bool have_midi = false;
-	for (list<MeterBridgeStrip>::iterator i = strips.begin(); i != strips.end(); ++i) {
-		if ( (*i).s->has_midi() && (*i).visible) {
-			have_midi = true;
-			break;
-		}
-	}
-	if (have_midi) {
-		metrics_right.set_metric_mode(2);
-	} else {
-		metrics_right.set_metric_mode(3);
-	}
+	resync_order();
 }
 
 void
-Meterbridge::sync_order_keys (RouteSortOrderKey src)
+Meterbridge::sync_order_keys ()
 {
 	Glib::Threads::Mutex::Lock lm (_resync_mutex);
 
@@ -596,6 +641,12 @@ Meterbridge::sync_order_keys (RouteSortOrderKey src)
 
 	int pos = 0;
 	int vis = 0;
+	MeterStrip * last = 0;
+
+	unsigned int metrics = 0;
+	MeterType lmt = MeterPeak;
+	bool have_midi = false;
+	metrics_left.set_metric_mode(1, lmt);
 
 	for (list<MeterBridgeStrip>::iterator i = strips.begin(); i != strips.end(); ++i) {
 
@@ -641,15 +692,86 @@ Meterbridge::sync_order_keys (RouteSortOrderKey src)
 			(*i).visible = true;
 				vis++;
 		}
-		(*i).s->set_pos(vis);
+
+		(*i).s->set_tick_bar(0);
+
+		MeterType nmt = (*i).s->meter_type();
+		if (nmt == MeterKrms) nmt = MeterPeak; // identical metrics
+		if (vis == 1) {
+			(*i).s->set_tick_bar(1);
+		}
+
+		if ((*i).visible && nmt != lmt && vis == 1) {
+			lmt = nmt;
+			metrics_left.set_metric_mode(1, lmt);
+		} else if ((*i).visible && nmt != lmt) {
+
+			if (last) {
+				last->set_tick_bar(last->get_tick_bar() | 2);
+			}
+			(*i).s->set_tick_bar((*i).s->get_tick_bar() | 1);
+
+			if (_metrics.size() <= metrics) {
+				_metrics.push_back(new MeterStrip(have_midi ? 2 : 3, lmt));
+				meterarea.pack_start (*_metrics[metrics], false, false);
+				_metrics[metrics]->set_session(_session);
+				_metrics[metrics]->show();
+			} else {
+				_metrics[metrics]->set_metric_mode(have_midi ? 2 : 3, lmt);
+			}
+			meterarea.reorder_child(*_metrics[metrics], pos++);
+			metrics++;
+
+			lmt = nmt;
+
+			if (_metrics.size() <= metrics) {
+				_metrics.push_back(new MeterStrip(1, lmt));
+				meterarea.pack_start (*_metrics[metrics], false, false);
+				_metrics[metrics]->set_session(_session);
+				_metrics[metrics]->show();
+			} else {
+				_metrics[metrics]->set_metric_mode(1, lmt);
+			}
+			meterarea.reorder_child(*_metrics[metrics], pos++);
+			metrics++;
+			have_midi = false;
+		}
+
+		if ((*i).visible && (*i).s->has_midi()) {
+			have_midi = true;
+		}
+
 		meterarea.reorder_child(*((*i).s), pos++);
+		if ((*i).visible) {
+			last = (*i).s;
+		}
+	}
+
+	if (last) {
+		last->set_tick_bar(last->get_tick_bar() | 2);
 	}
+
+	metrics_right.set_metric_mode(have_midi ? 2 : 3, lmt);
+
+	while (_metrics.size() > metrics) {
+		meterarea.remove(*_metrics.back());
+		delete (_metrics.back());
+		_metrics.pop_back();
+	}
+
+	_mm_left = metrics_left.get_metric_mode();
+	_mt_left = metrics_left.meter_type();
+	_mm_right = metrics_right.get_metric_mode();
+	_mt_right = metrics_right.meter_type();
+
+	on_scroll();
+	queue_resize();
 }
 
 void
 Meterbridge::resync_order()
 {
-	sync_order_keys(MixerSort);
+	sync_order_keys();
 }
 
 void
@@ -658,21 +780,17 @@ Meterbridge::parameter_changed (std::string const & p)
 	if (p == "show-busses-on-meterbridge") {
 		_show_busses = _session->config.get_show_busses_on_meterbridge();
 		resync_order();
-		update_metrics();
 	}
 	else if (p == "show-master-on-meterbridge") {
 		_show_master = _session->config.get_show_master_on_meterbridge();
 		resync_order();
-		update_metrics();
 	}
 	else if (p == "show-midi-on-meterbridge") {
 		_show_midi = _session->config.get_show_midi_on_meterbridge();
 		resync_order();
-		update_metrics();
 	}
 	else if (p == "meter-line-up-level") {
 		meter_clear_pattern_cache();
-		update_metrics();
 	}
 	else if (p == "show-rec-on-meterbridge") {
 		scroller.queue_resize();
@@ -686,6 +804,15 @@ Meterbridge::parameter_changed (std::string const & p)
 	else if (p == "show-name-on-meterbridge") {
 		scroller.queue_resize();
 	}
+	else if (p == "meterbridge-label-height") {
+		scroller.queue_resize();
+	}
+	else if (p == "show-monitor-on-meterbridge") {
+		scroller.queue_resize();
+	}
+	else if (p == "track-name-number") {
+		scroller.queue_resize();
+	}
 }
 
 void