From d995a07011b33011630ac93f290624ce006a8fbb Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 7 Dec 2020 19:16:05 -0700 Subject: [PATCH] remove AutomationList::paste since it is no longer required (just use ControlList::paste()) --- libs/ardour/ardour/automation_list.h | 1 - libs/ardour/automation_list.cc | 26 -------------------------- 2 files changed, 27 deletions(-) diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h index f272599693..da496df32a 100644 --- a/libs/ardour/ardour/automation_list.h +++ b/libs/ardour/ardour/automation_list.h @@ -87,7 +87,6 @@ public: AutomationList& operator= (const AutomationList&); void thaw (); - bool paste (const ControlList&, timepos_t const &, BeatsSamplesConverter const&); void set_automation_state (AutoState); AutoState automation_state() const; diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc index 0d51bdfdb4..7b351dc1ed 100644 --- a/libs/ardour/automation_list.cc +++ b/libs/ardour/automation_list.cc @@ -317,32 +317,6 @@ AutomationList::thaw () } } -bool -AutomationList::paste (const ControlList& alist, timepos_t const & pos, BeatsSamplesConverter const& bfc) -{ - if (time_domain() == alist.time_domain()) { - return ControlList::paste (alist, pos); - } - - /* time domains differ - need to map the time of all points in alist - * into our time domain - */ - - const bool to_sample = (time_domain() == Temporal::AudioTime); - - ControlList cl (alist); - cl.clear (); - - for (const_iterator i = alist.begin ();i != alist.end (); ++i) { - if (to_sample) { - cl.fast_simple_add (timepos_t ((*i)->when.samples()), (*i)->value); - } else { - cl.fast_simple_add (timepos_t ((*i)->when.beats ()), (*i)->value); - } - } - return ControlList::paste (cl, pos); -} - Command* AutomationList::memento_command (XMLNode* before, XMLNode* after) {