diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-11 02:55:52 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-11 02:55:52 +0000 |
| commit | d155f32039570e9e0cde11b42e395ca2bcc89ffd (patch) | |
| tree | 160ca7969013b713d70f31f15f328e7a11a723dd /libs/ardour/audio_diskstream.cc | |
| parent | e8060844021cdf5b4c6f3e284a892e70109787c3 (diff) | |
sorta-kinda working latency compensation, latency reporting and capture alignment ... working except that we report the wrong information to JACK and i've noticed a couple of odd circumstances where turning on a latent plugin caused punch recording to fail
git-svn-id: svn://localhost/ardour2/branches/3.0@9121 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_diskstream.cc')
| -rw-r--r-- | libs/ardour/audio_diskstream.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc index dd4310294b..5eba4cb822 100644 --- a/libs/ardour/audio_diskstream.cc +++ b/libs/ardour/audio_diskstream.cc @@ -390,12 +390,12 @@ AudioDiskstream::prepare_record_status(framepos_t capture_start_frame) boost::shared_ptr<ChannelList> c = channels.reader(); for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) { - RingBufferNPT<CaptureTransition>::rw_vector transvec; - (*chan)->capture_transition_buf->get_write_vector(&transvec); + RingBufferNPT<CaptureTransition>::rw_vector transitions; + (*chan)->capture_transition_buf->get_write_vector (&transitions); - if (transvec.len[0] > 0) { - transvec.buf[0]->type = CaptureStart; - transvec.buf[0]->capture_val = capture_start_frame; + if (transitions.len[0] > 0) { + transitions.buf[0]->type = CaptureStart; + transitions.buf[0]->capture_val = capture_start_frame; (*chan)->capture_transition_buf->increment_write_ptr(1); } else { // bad! @@ -1481,7 +1481,7 @@ AudioDiskstream::transport_stopped_wallclock (struct tm& when, time_t twhen, boo RegionFactory::region_name (region_name, whole_file_region_name, false); - cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->frames << " add region " << region_name << endl; + // cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->frames << " add region " << region_name << endl; try { @@ -1548,7 +1548,7 @@ AudioDiskstream::transport_looped (framepos_t transport_frame) capture_captured += _capture_offset; if (_alignment_style == ExistingMaterial) { - capture_captured += _session.worst_playback_latency(); + capture_captured += _session.worst_output_latency(); } else { capture_captured += _roll_delay; } |