lots of stuff related to capture alignment. things appear to be working now, but require the right alignment setting, which doesn't persist correctly at present

git-svn-id: svn://localhost/ardour2/branches/3.0@9107 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 8 insertions, 3 deletions

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index a83034d784..759495351a 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -328,6 +328,10 @@ Session::destroy ()
 void
 Session::set_worst_io_latencies ()
 {
+        if (_state_of_the_state & InitialConnecting) {
+                return;
+        }
+
 	_worst_output_latency = 0;
 	_worst_input_latency = 0;
 
@@ -341,6 +345,9 @@ Session::set_worst_io_latencies ()
 		_worst_output_latency = max (_worst_output_latency, (*i)->output()->latency());
 		_worst_input_latency = max (_worst_input_latency, (*i)->input()->latency());
 	}
+        
+        DEBUG_TRACE (DEBUG::Latency, string_compose ("Worst output latency: %1 Worst input latency: %2\n",
+                                                     _worst_output_latency, _worst_input_latency));
 }
 
 void
@@ -429,8 +436,6 @@ Session::when_engine_running ()
 
 	BootMessage (_("Compute I/O Latencies"));
 
-	set_worst_io_latencies ();
-
 	if (_clicking) {
 		// XXX HOW TO ALERT UI TO THIS ? DO WE NEED TO?
 	}
@@ -644,7 +649,7 @@ Session::when_engine_running ()
 		}
 	}
 
-	/* catch up on send+insert cnts */
+	set_worst_io_latencies ();
 
 	_state_of_the_state = StateOfTheState (_state_of_the_state & ~(CannotSave|Dirty));