diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 12:39:17 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 12:39:17 -0400 |
commit | 30b087ab3d28f1585987fa3f6ae006562ae192e3 (patch) | |
tree | 620ae0250b5d77f90a18f8c2b83be61e4fe7b0b5 /libs/ardour/automation_list.cc | |
parent | cb956e3e480716a3efd280a5287bdd7bee1cedc5 (diff) |
globally change all use of "frame" to refer to audio into "sample".
Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode
and video in order to keep the legible
Diffstat (limited to 'libs/ardour/automation_list.cc')
-rw-r--r-- | libs/ardour/automation_list.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc index a081418017..b3a727ff9e 100644 --- a/libs/ardour/automation_list.cc +++ b/libs/ardour/automation_list.cc @@ -24,7 +24,7 @@ #include <sstream> #include <algorithm> #include "ardour/automation_list.h" -#include "ardour/beats_frames_converter.h" +#include "ardour/beats_samples_converter.h" #include "ardour/event_type_map.h" #include "ardour/parameter_descriptor.h" #include "ardour/parameter_types.h" @@ -307,7 +307,7 @@ AutomationList::thaw () } bool -AutomationList::paste (const ControlList& alist, double pos, DoubleBeatsFramesConverter const& bfc) +AutomationList::paste (const ControlList& alist, double pos, DoubleBeatsSamplesConverter const& bfc) { AutomationType src_type = (AutomationType)alist.parameter().type(); AutomationType dst_type = (AutomationType)_parameter.type(); @@ -315,13 +315,13 @@ AutomationList::paste (const ControlList& alist, double pos, DoubleBeatsFramesCo if (parameter_is_midi (src_type) == parameter_is_midi (dst_type)) { return ControlList::paste (alist, pos); } - bool to_frame = parameter_is_midi (src_type); + bool to_sample = parameter_is_midi (src_type); ControlList cl (alist); cl.clear (); for (const_iterator i = alist.begin ();i != alist.end (); ++i) { double when = (*i)->when; - if (to_frame) { + if (to_sample) { when = bfc.to ((*i)->when); } else { when = bfc.from ((*i)->when); |