summaryrefslogtreecommitdiff
path: root/libs/ardour/element_importer.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/element_importer.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/element_importer.cc')
-rw-r--r--libs/ardour/element_importer.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/element_importer.cc b/libs/ardour/element_importer.cc
index 811880e44c..ace517f070 100644
--- a/libs/ardour/element_importer.cc
+++ b/libs/ardour/element_importer.cc
@@ -89,15 +89,15 @@ ElementImporter::timecode_to_string(Timecode::Time & time) const
return oss.str();
}
-framecnt_t
-ElementImporter::rate_convert_samples (framecnt_t samples) const
+samplecnt_t
+ElementImporter::rate_convert_samples (samplecnt_t samples) const
{
- if (sample_rate == session.frame_rate()) {
+ if (sample_rate == session.sample_rate()) {
return samples;
}
// +0.5 for proper rounding
- return static_cast<framecnt_t> (samples * (static_cast<double> (session.nominal_frame_rate()) / sample_rate) + 0.5);
+ return static_cast<samplecnt_t> (samples * (static_cast<double> (session.nominal_sample_rate()) / sample_rate) + 0.5);
}
string