From e15b5c6e6b35c08c90765776e37c50fb4c9d4f73 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 23 Apr 2020 17:06:40 +0200 Subject: [PATCH] Clean up Audition realtime_overwrite Auditioner seek calls are explicitly handled by the butler, and DR:overwrite_existing_buffers() is called explicitly to read MIDI data for audition. Session::non_realtime_overwrite is no longer required. This reverts commit 6fbcf837793ec9a8347fd2d12823b9e56587ffc0 and parts of 2d11667ce3d2ada93c0fb90978bdcc054413c2bb. --- libs/ardour/session_transport.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index 8bba6757d2..424c1dd1b7 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -1222,13 +1222,8 @@ Session::butler_transport_work () void Session::non_realtime_overwrite (int on_entry, bool& finished) { - RouteList rl (*(routes.reader ())); - - if (is_auditioning ()) { - rl.push_back (auditioner); - } - - for (RouteList::iterator i = rl.begin(); i != rl.end(); ++i) { + boost::shared_ptr rl = routes.reader(); + for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); if (tr && tr->pending_overwrite ()) { tr->overwrite_existing_buffers ();