X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fdisk_writer.cc;h=c30143d262d978d001b7bebc1f31c08bd8536045;hb=5ada17eba0195d90f0685776251b384efdf5168e;hp=c05b19a12c428acd49062dd0be3654a383e70a82;hpb=abb7cb90e703ccce72618b2a910112a8d25b5572;p=ardour.git diff --git a/libs/ardour/disk_writer.cc b/libs/ardour/disk_writer.cc index c05b19a12c..c30143d262 100644 --- a/libs/ardour/disk_writer.cc +++ b/libs/ardour/disk_writer.cc @@ -89,20 +89,14 @@ void DiskWriter::check_record_status (samplepos_t transport_sample, double speed, bool can_record) { int possibly_recording; - int rolling; - int change; const int transport_rolling = 0x4; const int track_rec_enabled = 0x2; const int global_rec_enabled = 0x1; - const int fully_rec_enabled = (transport_rolling|track_rec_enabled|global_rec_enabled); + const int fully_rec_enabled = (transport_rolling |track_rec_enabled | global_rec_enabled); - /* merge together the 3 factors that affect record status, and compute - * what has changed. - */ + /* merge together the 3 factors that affect record status, and compute what has changed. */ - rolling = _session.transport_speed() != 0.0f; - possibly_recording = (rolling << 2) | ((int)record_enabled() << 1) | (int)can_record; - change = possibly_recording ^ last_possibly_recording; + possibly_recording = (speed != 0.0f ? 4 : 0) | (record_enabled() ? 2 : 0) | (can_record ? 1 : 0); if (possibly_recording == last_possibly_recording) { return; @@ -114,55 +108,57 @@ DiskWriter::check_record_status (samplepos_t transport_sample, double speed, boo return; } - capture_start_sample = transport_sample; - first_recordable_sample = capture_start_sample + _input_latency; + Location* loc; + if (_session.config.get_punch_in () && 0 != (loc = _session.locations()->auto_punch_location ())) { + capture_start_sample = loc->start (); + } else { + capture_start_sample = _session.transport_sample (); + } + + first_recordable_sample = capture_start_sample; + if (_alignment_style == ExistingMaterial) { - // XXX + first_recordable_sample += _capture_offset + _playback_offset; + } + + if (_session.config.get_punch_out () && 0 != (loc = _session.locations()->auto_punch_location ())) { + /* this freezes the punch-out point when starting to record. + * + * We should allow to move it or at least allow to disable punch-out + * while rolling.. + */ + last_recordable_sample = loc->end (); + if (_alignment_style == ExistingMaterial) { + last_recordable_sample += _capture_offset + _playback_offset; + } + } else { + last_recordable_sample = max_samplepos; } - DEBUG_TRACE (DEBUG::CaptureAlignment, string_compose ("%1: @ %7 (%9) FRF = %2 CSF = %4 CO = %5, EMO = %6 RD = %8 WOL %10 WTL %11\n", - name(), first_recordable_sample, last_recordable_sample, capture_start_sample, - 0, - 0, + DEBUG_TRACE (DEBUG::CaptureAlignment, string_compose ("%1: @ %2 (STS: %3) CS:%4 FRS: %5 IL: %7, OL: %8 CO: %r9 PO: %10 WOL: %11 WIL: %12\n", + name(), transport_sample, _session.transport_sample(), + capture_start_sample, + first_recordable_sample, + last_recordable_sample, + _input_latency, + _output_latency, + _capture_offset, + _playback_offset, _session.worst_output_latency(), - _session.worst_track_latency())); + _session.worst_input_latency())); prepare_record_status (capture_start_sample); - } else { - - if (last_possibly_recording == fully_rec_enabled) { - - /* we were recording last time */ - - if (change & transport_rolling) { - - /* transport-change (stopped rolling): last_recordable_sample was set in ::prepare_to_stop(). We - * had to set it there because we likely rolled past the stopping point to declick out, - * and then backed up. - */ - - } else { - /* punch out */ - - last_recordable_sample = _session.transport_sample(); - - if (_alignment_style == ExistingMaterial) { - //XXX - } - } - } } last_possibly_recording = possibly_recording; } void -DiskWriter::calculate_record_range (Evoral::OverlapType ot, samplepos_t transport_sample, samplecnt_t nframes, - samplecnt_t & rec_nframes, samplecnt_t & rec_offset) +DiskWriter::calculate_record_range (Evoral::OverlapType ot, samplepos_t transport_sample, samplecnt_t nframes, samplecnt_t & rec_nframes, samplecnt_t & rec_offset) { switch (ot) { case Evoral::OverlapNone: @@ -347,31 +343,33 @@ void DiskWriter::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool result_required) { + if (!_active && !_pending_active) { + return; + } + _active = _pending_active; + uint32_t n; boost::shared_ptr c = channels.reader(); ChannelList::iterator chan; + samplecnt_t rec_offset = 0; samplecnt_t rec_nframes = 0; bool nominally_recording; + bool re = record_enabled (); + bool punch_in = _session.config.get_punch_in () && _session.locations()->auto_punch_location (); bool can_record = _session.actively_recording (); - - if (_active) { - if (!_pending_active) { - _active = false; - return; - } - } else { - if (_pending_active) { - _active = true; - } else { - return; - } - } + can_record |= _session.get_record_enabled () && punch_in && _session.transport_sample () <= _session.locations()->auto_punch_location ()->start (); _need_butler = false; - check_record_status (start_sample, 1, can_record); +#ifndef NDEBUG + if (speed != 0 && re) { + DEBUG_TRACE (DEBUG::CaptureAlignment, string_compose ("%1: run() start: %2 end: %3 NF: %4\n", _name, start_sample, end_sample, nframes)); + } +#endif + + check_record_status (start_sample, speed, can_record); if (nframes == 0) { return; @@ -395,7 +393,7 @@ DiskWriter::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp get_location_times (loop_loc, &loop_start, &loop_end, &loop_length); } - if (nominally_recording || (re && was_recording && _session.get_record_enabled() && (_session.config.get_punch_in() || _session.preroll_record_punch_enabled()))) { + if (nominally_recording || (re && was_recording && _session.get_record_enabled() && punch_in)) { Evoral::OverlapType ot = Evoral::coverage (first_recordable_sample, last_recordable_sample, start_sample, end_sample); // XXX should this be transport_sample + nframes - 1 ? coverage() expects its parameter ranges to include their end points