diff options
| author | Robin Gareus <robin@gareus.org> | 2017-01-19 12:57:47 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-01-19 13:05:54 +0100 |
| commit | e959a762b5a0d09b92a95e2171a22d86b655a1c5 (patch) | |
| tree | f23f1a5d44c8e11138c3e5c49a129cd2b67b943b /libs/ardour/midi_diskstream.cc | |
| parent | ebdf3de598413e135e1f92e19634ac5eb8abe752 (diff) | |
Rework preroll-rec API:
* rename: indicate that recording happens after preroll, punch-in
* move API into libardour: rec+roll (no separate setup, seek, roll APIs)
Diffstat (limited to 'libs/ardour/midi_diskstream.cc')
| -rw-r--r-- | libs/ardour/midi_diskstream.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index 9e784cbd38..ac47f13df1 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -367,7 +367,7 @@ MidiDiskstream::process (BufferSet& bufs, framepos_t transport_frame, pframes_t adjust_capture_position = 0; - if (nominally_recording || (re && was_recording && _session.get_record_enabled() && (_session.config.get_punch_in() || _session.preroll_record_enabled()))) { + if (nominally_recording || (re && was_recording && _session.get_record_enabled() && (_session.config.get_punch_in() || _session.preroll_record_punch_enabled()))) { Evoral::OverlapType ot = Evoral::coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes); // XXX should this be transport_frame + nframes - 1 ? coverage() expects its parameter ranges to include their end points @@ -1238,8 +1238,8 @@ MidiDiskstream::get_state () Location* pi; - if (_session.preroll_record_enabled ()) { - snprintf (buf, sizeof (buf), "%" PRId64, _session.preroll_record_in ()); + if (_session.preroll_record_punch_enabled ()) { + snprintf (buf, sizeof (buf), "%" PRId64, _session.preroll_record_punch_pos ()); } else if (_session.config.get_punch_in() && ((pi = _session.locations()->auto_punch_location()) != 0)) { snprintf (buf, sizeof (buf), "%" PRId64, pi->start()); } else { |