From e959a762b5a0d09b92a95e2171a22d86b655a1c5 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 19 Jan 2017 12:57:47 +0100 Subject: 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) --- libs/ardour/session.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libs/ardour/session.cc') 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 { -- cgit v1.2.3