From 0d7b298fbe5dd8cde48c1eb705223984772dd0f1 Mon Sep 17 00:00:00 2001 From: nick_m Date: Mon, 12 Dec 2016 01:59:23 +1100 Subject: [PATCH] no-op - rename TempoMap::set_active_tempos -> TempoMap::set_active_tempi --- libs/ardour/ardour/tempo.h | 2 +- libs/ardour/tempo.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index 2d2c008c81..3bdaaa84eb 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -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); diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index a074a8a672..b2e2dbe1be 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -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; } }