From 94e4e2f55f79fc025dad17a72dcd7217869a3d91 Mon Sep 17 00:00:00 2001 From: Colin Fletcher Date: Thu, 25 Jun 2015 15:09:49 +0100 Subject: [PATCH] rename TempoMap::cut_time() to remove_time() Everywhere else, 'cut time' has been renamed to 'remove time': for consistency, rename this one remaining function to match. --- gtk2_ardour/editor_ops.cc | 2 +- libs/ardour/ardour/tempo.h | 2 +- libs/ardour/tempo.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 2c44508b12..2413126e3a 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -7215,7 +7215,7 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, if (tempo_too) { XMLNode& before (_session->tempo_map().get_state()); - if (_session->tempo_map().cut_time (pos, frames) ) { + if (_session->tempo_map().remove_time (pos, frames) ) { XMLNode& after (_session->tempo_map().get_state()); _session->add_command (new MementoCommand(_session->tempo_map(), &before, &after)); commit = true; diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index 24a3f53fe9..d5ae2959c6 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -323,7 +323,7 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible void change_initial_tempo (double bpm, double note_type); void insert_time (framepos_t, framecnt_t); - bool cut_time (framepos_t where, framecnt_t amount); //returns true if anything was moved + bool remove_time (framepos_t where, framecnt_t amount); //returns true if anything was moved int n_tempos () const; int n_meters () const; diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 244c050834..c7e46ba327 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -1903,7 +1903,7 @@ TempoMap::insert_time (framepos_t where, framecnt_t amount) PropertyChanged (PropertyChange ()); } bool -TempoMap::cut_time (framepos_t where, framecnt_t amount) +TempoMap::remove_time (framepos_t where, framecnt_t amount) { bool moved = false;