summaryrefslogtreecommitdiff
path: root/libs/ardour/export_format_specification.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/export_format_specification.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/export_format_specification.cc')
-rw-r--r--libs/ardour/export_format_specification.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/libs/ardour/export_format_specification.cc b/libs/ardour/export_format_specification.cc
index c63db4382c..5275ddba6c 100644
--- a/libs/ardour/export_format_specification.cc
+++ b/libs/ardour/export_format_specification.cc
@@ -57,11 +57,11 @@ ExportFormatSpecification::Time::operator= (AnyTime const & other)
return *this;
}
-framecnt_t
-ExportFormatSpecification::Time::get_frames_at (framepos_t position, framecnt_t target_rate) const
+samplecnt_t
+ExportFormatSpecification::Time::get_samples_at (samplepos_t position, samplecnt_t target_rate) const
{
- framecnt_t duration = session.any_duration_to_frames (position, *this);
- return ((double) target_rate / session.frame_rate()) * duration + 0.5;
+ samplecnt_t duration = session.any_duration_to_samples (position, *this);
+ return ((double) target_rate / session.sample_rate()) * duration + 0.5;
}
XMLNode &
@@ -77,15 +77,15 @@ ExportFormatSpecification::Time::get_state ()
node->set_property ("hours", timecode.hours);
node->set_property ("minutes", timecode.minutes);
node->set_property ("seconds", timecode.seconds);
- node->set_property ("frames", timecode.frames);
+ node->set_property ("samples", timecode.frames);
break;
case BBT:
node->set_property ("bars", bbt.bars);
node->set_property ("beats", bbt.beats);
node->set_property ("ticks", bbt.ticks);
break;
- case Frames:
- node->set_property ("frames", frames);
+ case Samples:
+ node->set_property ("samples", samples);
break;
case Seconds:
node->set_property ("seconds", seconds);
@@ -107,7 +107,7 @@ ExportFormatSpecification::Time::set_state (const XMLNode & node)
node.get_property ("hours", timecode.hours);
node.get_property ("minutes", timecode.minutes);
node.get_property ("seconds", timecode.seconds);
- node.get_property ("frames", timecode.frames);
+ node.get_property ("samples", timecode.frames);
break;
case BBT:
@@ -116,8 +116,8 @@ ExportFormatSpecification::Time::set_state (const XMLNode & node)
node.get_property ("ticks", bbt.ticks);
break;
- case Frames:
- node.get_property ("frames", frames);
+ case Samples:
+ node.get_property ("samples", samples);
break;
case Seconds: