summaryrefslogtreecommitdiff
path: root/libs/ardour/automation_control.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2017-09-18 12:39:17 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2017-09-18 12:39:17 -0400
commit30b087ab3d28f1585987fa3f6ae006562ae192e3 (patch)
tree620ae0250b5d77f90a18f8c2b83be61e4fe7b0b5 /libs/ardour/automation_control.cc
parentcb956e3e480716a3efd280a5287bdd7bee1cedc5 (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_control.cc')
-rw-r--r--libs/ardour/automation_control.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index 02bcbf4f65..5755e04aac 100644
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -100,7 +100,7 @@ double
AutomationControl::get_value() const
{
bool from_list = alist() && alist()->automation_playback();
- return Control::get_double (from_list, _session.transport_frame());
+ return Control::get_double (from_list, _session.transport_sample());
}
double
@@ -158,7 +158,7 @@ AutomationControl::grouped_controls () const
}
void
-AutomationControl::automation_run (framepos_t start, pframes_t nframes)
+AutomationControl::automation_run (samplepos_t start, pframes_t nframes)
{
if (!automation_playback ()) {
return;
@@ -186,7 +186,7 @@ void
AutomationControl::actually_set_value (double value, PBD::Controllable::GroupControlDisposition gcd)
{
boost::shared_ptr<AutomationList> al = alist ();
- const framepos_t pos = _session.transport_frame();
+ const samplepos_t pos = _session.transport_sample();
bool to_list;
/* We cannot use ::get_value() here since that is virtual, and intended
@@ -255,8 +255,8 @@ AutomationControl::set_automation_state (AutoState as)
AutomationWatch::instance().add_automation_watch (shared_from_this());
} else if (as & (Touch | Latch)) {
if (alist()->empty()) {
- Control::set_double (val, _session.current_start_frame (), true);
- Control::set_double (val, _session.current_end_frame (), true);
+ Control::set_double (val, _session.current_start_sample (), true);
+ Control::set_double (val, _session.current_end_sample (), true);
Changed (true, Controllable::NoGroup);
}
if (!touching()) {