allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

no-op - rename TempoMap::set_active_tempos -> TempoMap::set_active_tempi

Browse Source
This commit is contained in:
nick_m
2016-12-12 01:59:23 +11:00
parent 4d625d35b6
commit 0d7b298fbe
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/tempo.h
View File

@@ -525,7 +525,7 @@ private:
const MeterSection& meter_section_at_beat_locked (const Metrics& metrics, const double& beat) const;
bool check_solved (const Metrics& metrics) const;
bool set_active_tempos (const Metrics& metrics, const framepos_t& frame);
bool set_active_tempi (const Metrics& metrics, const framepos_t& frame);
bool solve_map_minute (Metrics& metrics, TempoSection* section, const double& minute);
bool solve_map_pulse (Metrics& metrics, TempoSection* section, const double& pulse);

4
libs/ardour/tempo.cc
View File

@@ -2502,7 +2502,7 @@ TempoMap::check_solved (const Metrics& metrics) const
}
bool
TempoMap::set_active_tempos (const Metrics& metrics, const framepos_t& frame)
TempoMap::set_active_tempi (const Metrics& metrics, const framepos_t& frame)
{
for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) {
TempoSection* t;
@@ -2696,7 +2696,7 @@ TempoMap::solve_map_minute (Metrics& imaginary, MeterSection* section, const dou
if (section->initial()) {
/* lock the first tempo to our first meter */
if (!set_active_tempos (imaginary, section->frame_at_minute (minute))) {
if (!set_active_tempi (imaginary, section->frame_at_minute (minute))) {
return false;
}
}