summaryrefslogtreecommitdiff
path: root/libs/ardour/session.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/session.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/session.cc')
-rw-r--r--libs/ardour/session.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 086edf2b45..0f6f74ef5d 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -304,7 +304,7 @@ Session::Session (AudioEngine &eng,
, _play_range (false)
, _range_selection (-1,-1)
, _object_selection (-1,-1)
- , _preroll_record_in (-1)
+ , _preroll_record_punch_pos (-1)
, main_outs (0)
, first_file_data_format_reset (true)
, first_file_header_format_reset (true)
@@ -2001,7 +2001,7 @@ Session::disable_record (bool rt_context, bool force)
if (!rt_context) {
remove_pending_capture_state ();
}
- unset_preroll_record ();
+ unset_preroll_record_punch ();
}
}
@@ -2039,7 +2039,7 @@ Session::maybe_enable_record (bool rt_context)
}
if (_transport_speed) {
- if (!config.get_punch_in() && !preroll_record_enabled ()) {
+ if (!config.get_punch_in() && !preroll_record_punch_enabled ()) {
enable_record ();
}
} else {