summaryrefslogtreecommitdiff
path: root/libs/ardour/automation_watch.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_watch.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_watch.cc')
-rw-r--r--libs/ardour/automation_watch.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/automation_watch.cc b/libs/ardour/automation_watch.cc
index ad05f3ac69..0445d05d8a 100644
--- a/libs/ardour/automation_watch.cc
+++ b/libs/ardour/automation_watch.cc
@@ -82,9 +82,9 @@ AutomationWatch::add_automation_watch (boost::shared_ptr<AutomationControl> ac)
if (_session && _session->transport_rolling() && ac->alist()->automation_write()) {
DEBUG_TRACE (DEBUG::Automation, string_compose ("\ttransport is rolling @ %1, audible = %2so enter write pass\n",
- _session->transport_speed(), _session->audible_frame()));
+ _session->transport_speed(), _session->audible_sample()));
/* add a guard point since we are already moving */
- ac->list()->set_in_write_pass (true, true, _session->audible_frame());
+ ac->list()->set_in_write_pass (true, true, _session->audible_sample());
}
/* we can't store shared_ptr<Destructible> in connections because it
@@ -119,7 +119,7 @@ AutomationWatch::remove_automation_watch (boost::shared_ptr<AutomationControl> a
}
void
-AutomationWatch::transport_stop_automation_watches (framepos_t when)
+AutomationWatch::transport_stop_automation_watches (samplepos_t when)
{
DEBUG_TRACE (DEBUG::Automation, "clear all automation watches\n");
@@ -153,7 +153,7 @@ AutomationWatch::timer ()
{
Glib::Threads::Mutex::Lock lm (automation_watch_lock);
- framepos_t time = _session->audible_frame ();
+ samplepos_t time = _session->audible_sample ();
if (time > _last_time) { //we only write automation in the forward direction; this fixes automation-recording in a loop
for (AutomationWatches::iterator aw = automation_watches.begin(); aw != automation_watches.end(); ++aw) {
if ((*aw)->alist()->automation_write()) {
@@ -223,7 +223,7 @@ AutomationWatch::transport_state_change ()
bool rolling = _session->transport_rolling();
- _last_time = _session->audible_frame ();
+ _last_time = _session->audible_sample ();
{
Glib::Threads::Mutex::Lock lm (automation_watch_lock);