merge from 2.0-ongoing by hand, minus key binding editor

git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 27 insertions, 6 deletions

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 19095425f2..be7dfb8469 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -53,7 +53,7 @@ using namespace ARDOUR;
 using namespace PBD;
 
 uint32_t Route::order_key_cnt = 0;
-
+sigc::signal<void> Route::SyncOrderKeys;
 
 Route::Route (Session& sess, string name, int input_min, int input_max, int output_min, int output_max, Flag flg, DataType default_type)
 	: IO (sess, name, input_min, input_max, output_min, output_max, default_type),
@@ -161,10 +161,35 @@ void
 Route::set_order_key (const char* name, long n)
 {
 	order_keys[strdup(name)] = n;
+
+	if (Config->get_sync_all_route_ordering()) {
+		for (OrderKeys::iterator x = order_keys.begin(); x != order_keys.end(); ++x) {
+			x->second = n;
+		}
+	} 
+
 	_session.set_dirty ();
 }
 
 void
+Route::sync_order_keys ()
+{
+	uint32_t key;
+	
+	if (order_keys.empty()) {
+		return;
+	}
+	
+	OrderKeys::iterator x = order_keys.begin();
+	key = x->second;
+	++x;
+
+	for (; x != order_keys.end(); ++x) {
+		x->second = key;
+	}
+}
+
+void
 Route::inc_gain (gain_t fraction, void *src)
 {
 	IO::inc_gain (fraction, src);
@@ -460,13 +485,9 @@ Route::process_output_buffers (BufferSet& bufs,
 		
 	    // OR recording 
 		
-		// h/w monitoring not in use 
-		
-		(!Config->get_monitoring_model() == HardwareMonitoring && 
-
 		 // AND software monitoring required
 
-		 Config->get_monitoring_model() == SoftwareMonitoring)) { 
+		Config->get_monitoring_model() == SoftwareMonitoring) { 
 		
 		if (apply_gain_automation) {