summaryrefslogtreecommitdiff
path: root/libs/ardour/audio_diskstream.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2017-01-19 12:57:47 +0100
committerRobin Gareus <robin@gareus.org>2017-01-19 13:05:54 +0100
commite959a762b5a0d09b92a95e2171a22d86b655a1c5 (patch)
treef23f1a5d44c8e11138c3e5c49a129cd2b67b943b /libs/ardour/audio_diskstream.cc
parentebdf3de598413e135e1f92e19634ac5eb8abe752 (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/audio_diskstream.cc')
-rw-r--r--libs/ardour/audio_diskstream.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index f157d81ada..4bbcab419d 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -1923,8 +1923,8 @@ AudioDiskstream::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 {