globally change all use of "frame" to refer to audio into "sample".

[ardour.git] / libs / ardour / element_importer.cc

diff --git a/libs/ardour/element_importer.cc b/libs/ardour/element_importer.cc
index 811880e44c8cd1f7479f7dbf95b1bd3ab8af01fa..ace517f0709893951752b1f16aa3c26c65f26856 100644 (file)
--- 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