summaryrefslogtreecommitdiff
path: root/nutemp
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 /nutemp
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 'nutemp')
-rw-r--r--nutemp/t.cc12
-rw-r--r--nutemp/t.h20
2 files changed, 16 insertions, 16 deletions
diff --git a/nutemp/t.cc b/nutemp/t.cc
index 59d4dd5f9a..1b8b449d6f 100644
--- a/nutemp/t.cc
+++ b/nutemp/t.cc
@@ -154,13 +154,13 @@ TempoMetric::superclock_per_note_type_at_superclock (superclock_t sc) const
}
superclock_t
-TempoMetric::superclocks_per_grid (framecnt_t sr) const
+TempoMetric::superclocks_per_grid (samplecnt_t sr) const
{
return (superclock_ticks_per_second * Meter::note_value()) / (note_types_per_minute() / Tempo::note_type());
}
superclock_t
-TempoMetric::superclocks_per_bar (framecnt_t sr) const
+TempoMetric::superclocks_per_bar (samplecnt_t sr) const
{
return superclocks_per_grid (sr) * _divisions_per_bar;
}
@@ -275,7 +275,7 @@ It would be more accurate to substitute the work 'pulse' for 'beat' above.
*/
void
-TempoMetric::compute_c_superclock (framecnt_t sr, superclock_t end_scpqn, superclock_t superclock_duration)
+TempoMetric::compute_c_superclock (samplecnt_t sr, superclock_t end_scpqn, superclock_t superclock_duration)
{
if ((superclocks_per_quarter_note() == end_scpqn) || !ramped()) {
_c_per_superclock = 0.0;
@@ -285,7 +285,7 @@ TempoMetric::compute_c_superclock (framecnt_t sr, superclock_t end_scpqn, superc
_c_per_superclock = log ((double) superclocks_per_quarter_note () / end_scpqn) / superclock_duration;
}
void
-TempoMetric::compute_c_quarters (framecnt_t sr, superclock_t end_scpqn, Evoral::Beats const & quarter_duration)
+TempoMetric::compute_c_quarters (samplecnt_t sr, superclock_t end_scpqn, Evoral::Beats const & quarter_duration)
{
if ((superclocks_per_quarter_note () == end_scpqn) || !ramped()) {
_c_per_quarter = 0.0;
@@ -354,7 +354,7 @@ TempoMapPoint::bbt_at (Evoral::Beats const & qn) const
return metric().bbt_add (_bbt, Timecode::BBT_Offset (0, 0, ticks_delta));
}
-TempoMap::TempoMap (Tempo const & initial_tempo, Meter const & initial_meter, framecnt_t sr)
+TempoMap::TempoMap (Tempo const & initial_tempo, Meter const & initial_meter, samplecnt_t sr)
: _sample_rate (sr)
, _dirty (false)
{
@@ -1099,7 +1099,7 @@ TempoMap::superclock_at_locked (Timecode::BBT_Time const & bbt) const
}
void
-TempoMap::set_sample_rate (framecnt_t new_sr)
+TempoMap::set_sample_rate (samplecnt_t new_sr)
{
//Glib::Threads::RWLock::ReaderLock lm (_lock);
double ratio = new_sr / (double) _sample_rate;
diff --git a/nutemp/t.h b/nutemp/t.h
index b734dcead8..1004f46a4c 100644
--- a/nutemp/t.h
+++ b/nutemp/t.h
@@ -117,11 +117,11 @@ class LIBARDOUR_API TempoMetric : public Tempo, public Meter {
double c_per_superclock () const { return _c_per_superclock; }
double c_per_quarter () const { return _c_per_quarter; }
- void compute_c_superclock (framecnt_t sr, superclock_t end_superclocks_per_note_type, superclock_t duration);
- void compute_c_quarters (framecnt_t sr, superclock_t end_superclocks_per_note_type, Evoral::Beats const & duration);
+ void compute_c_superclock (samplecnt_t sr, superclock_t end_superclocks_per_note_type, superclock_t duration);
+ void compute_c_quarters (samplecnt_t sr, superclock_t end_superclocks_per_note_type, Evoral::Beats const & duration);
- superclock_t superclocks_per_bar (framecnt_t sr) const;
- superclock_t superclocks_per_grid (framecnt_t sr) const;
+ superclock_t superclocks_per_bar (samplecnt_t sr) const;
+ superclock_t superclocks_per_grid (samplecnt_t sr) const;
superclock_t superclock_at_qn (Evoral::Beats const & qn) const;
superclock_t superclock_per_note_type_at_superclock (superclock_t) const;
@@ -224,8 +224,8 @@ class LIBARDOUR_API TempoMapPoint
TempoMetric const & metric() const { return is_explicit() ? _explicit.metric : _reference->metric(); }
PositionLockStyle lock_style() const { return is_explicit() ? _explicit.lock_style : _reference->lock_style(); }
- void compute_c_superclock (framecnt_t sr, superclock_t end_superclocks_per_note_type, superclock_t duration) { if (is_explicit()) { _explicit.metric.compute_c_superclock (sr, end_superclocks_per_note_type, duration); } }
- void compute_c_quarters (framecnt_t sr, superclock_t end_superclocks_per_note_type, Evoral::Beats const & duration) { if (is_explicit()) { _explicit.metric.compute_c_quarters (sr, end_superclocks_per_note_type, duration); } }
+ void compute_c_superclock (samplecnt_t sr, superclock_t end_superclocks_per_note_type, superclock_t duration) { if (is_explicit()) { _explicit.metric.compute_c_superclock (sr, end_superclocks_per_note_type, duration); } }
+ void compute_c_quarters (samplecnt_t sr, superclock_t end_superclocks_per_note_type, Evoral::Beats const & duration) { if (is_explicit()) { _explicit.metric.compute_c_quarters (sr, end_superclocks_per_note_type, duration); } }
/* None of these properties can be set for an Implicit point, because
* they are determined by the TempoMapPoint pointed to by _reference.
@@ -301,12 +301,12 @@ typedef std::list<TempoMapPoint> TempoMapPoints;
class LIBARDOUR_API TempoMap
{
public:
- TempoMap (Tempo const & initial_tempo, Meter const & initial_meter, framecnt_t sr);
+ TempoMap (Tempo const & initial_tempo, Meter const & initial_meter, samplecnt_t sr);
void set_dirty (bool yn);
- void set_sample_rate (framecnt_t sr);
- framecnt_t sample_rate() const { return _sample_rate; }
+ void set_sample_rate (samplecnt_t sr);
+ samplecnt_t sample_rate() const { return _sample_rate; }
void remove_explicit_point (superclock_t);
@@ -367,7 +367,7 @@ class LIBARDOUR_API TempoMap
private:
TempoMapPoints _points;
- framecnt_t _sample_rate;
+ samplecnt_t _sample_rate;
mutable Glib::Threads::RWLock _lock;
bool _dirty;