diff options
| author | Robin Gareus <robin@gareus.org> | 2016-11-27 22:54:05 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-11-27 22:54:23 +0100 |
| commit | 1de584961a746090583a4c97251f25924d6e03ad (patch) | |
| tree | 6cc66baec95fde2dbf91d7c1a02f26026a149142 /libs/ardour/diskstream.cc | |
| parent | 5ec21347a9595a88d7d1e935a5e4a271bdfb7933 (diff) | |
NO-OP; Backport changes from Mixbus branch
Diffstat (limited to 'libs/ardour/diskstream.cc')
| -rw-r--r-- | libs/ardour/diskstream.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index ebd11a1887..a81c1e473d 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -260,6 +260,16 @@ Diskstream::set_capture_offset () _capture_offset = 0; break; } +#ifdef MIXBUS + framecnt_t port_offset; + if (_track->mixbus_internal_bounce (port_offset)) { + /* _capture_offset may become negative, but the sum + * _capture_offset + existing_material_offset + * will be postive. + */ + _capture_offset -= port_offset; + } +#endif DEBUG_TRACE (DEBUG::CaptureAlignment, string_compose ("%1: using IO latency, capture offset set to %2 with style = %3\n", name(), _capture_offset, enum_2_string (_alignment_style))); } |