diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-09-14 19:05:05 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-09-14 19:05:05 +0000 |
| commit | a3ea8641e4be48a51ad7baaeb533865624a1e895 (patch) | |
| tree | 0332e0492059457a9a055f3454c223b6ac617547 /libs/ardour/io.cc | |
| parent | 711d16a651a56d969a8cb8c0f0f9e30be418a912 (diff) | |
back-port Ardour3's capture alignment code to Ardour2, to get correct results with the new JACK latency API
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@10085 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/io.cc')
| -rw-r--r-- | libs/ardour/io.cc | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index 561fb93432..9026cfacf6 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -2210,16 +2210,6 @@ IO::set_output_maximum (int n) _output_maximum = n; } -void -IO::set_port_latency (nframes_t nframes) -{ - Glib::Mutex::Lock lm (io_lock); - - for (vector<Port *>::iterator i = _outputs.begin(); i != _outputs.end(); ++i) { - (*i)->set_latency (nframes); - } -} - nframes_t IO::output_latency () const { @@ -2231,7 +2221,7 @@ IO::output_latency () const /* io lock not taken - must be protected by other means */ for (vector<Port *>::const_iterator i = _outputs.begin(); i != _outputs.end(); ++i) { - if ((latency = _session.engine().get_port_total_latency (*(*i))) > max_latency) { + if ((latency = (*i)->private_latency_range (true).max) > max_latency) { max_latency = latency; } } @@ -2250,7 +2240,7 @@ IO::input_latency () const /* io lock not taken - must be protected by other means */ for (vector<Port *>::const_iterator i = _inputs.begin(); i != _inputs.end(); ++i) { - if ((latency = _session.engine().get_port_total_latency (*(*i))) > max_latency) { + if ((latency = (*i)->private_latency_range (false).max) > max_latency) { max_latency = latency; } } |