From 81384537ef1d7801ed440b577643a083908e8f44 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 12 Jul 2023 12:55:28 -0600 Subject: [PATCH] temporal: remove useless _floating member and API from TempoMapPoint --- libs/temporal/tempo.cc | 13 ------------- libs/temporal/temporal/tempo.h | 10 +--------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/libs/temporal/tempo.cc b/libs/temporal/tempo.cc index 10ff073389..f89bf7c997 100644 --- a/libs/temporal/tempo.cc +++ b/libs/temporal/tempo.cc @@ -773,19 +773,6 @@ MusicTimePoint::set_name (std::string const & str) /* XXX need a signal or something to announce change */ } - -void -TempoMapPoint::start_float () -{ - _floating = true; -} - -void -TempoMapPoint::end_float () -{ - _floating = false; -} - /* TEMPOMAP */ TempoMap::TempoMap (Tempo const & initial_tempo, Meter const & initial_meter) diff --git a/libs/temporal/temporal/tempo.h b/libs/temporal/temporal/tempo.h index ad08acb310..322e0cde47 100644 --- a/libs/temporal/temporal/tempo.h +++ b/libs/temporal/temporal/tempo.h @@ -628,23 +628,15 @@ class LIBTEMPORAL_API TempoMapPoint : public Point, public TempoMetric { public: TempoMapPoint (TempoMap const & map, TempoMetric const & tm, superclock_t sc, Beats const & q, BBT_Time const & bbt) - : Point (map, sc, q, bbt), TempoMetric (tm), _floating (false) {} + : Point (map, sc, q, bbt), TempoMetric (tm) {} ~TempoMapPoint () {} - /* called by a GUI that is manipulating the position of this point */ - void start_float (); - void end_float (); - bool floating() const { return _floating; } - bool is_explicit_meter() const { return _meter->sclock() == sclock(); } bool is_explicit_tempo() const { return _tempo->sclock() == sclock(); } bool is_explicit_position() const { return false; } bool is_explicit () const { return is_explicit_meter() || is_explicit_tempo() || is_explicit_position(); } timepos_t time() const { if (is_explicit_meter()) { return _meter->time(); } else if (is_explicit_tempo()) { return _tempo->time(); } else { return timepos_t::from_superclock (sclock()); } } - - private: - bool _floating; }; typedef std::vector TempoMapPoints;