diff --git a/libs/temporal/tempo.cc b/libs/temporal/tempo.cc index 13648586f6..10ff073389 100644 --- a/libs/temporal/tempo.cc +++ b/libs/temporal/tempo.cc @@ -2765,16 +2765,6 @@ TempoMap::get_grid (TempoMapPoints& ret, superclock_t rstart, superclock_t end, DEBUG_TRACE (DEBUG::Grid, "<<< GRID DONE\n"); } -uint32_t -TempoMap::count_bars (Beats const & start, Beats const & end) const -{ - TempoMapPoints bar_grid; - superclock_t s (superclock_at (start)); - superclock_t e (superclock_at (end)); - get_grid (bar_grid, s, e, 1); - return bar_grid.size(); -} - std::ostream& std::operator<<(std::ostream& str, Meter const & m) { diff --git a/libs/temporal/temporal/tempo.h b/libs/temporal/temporal/tempo.h index 823d2b1cec..ad08acb310 100644 --- a/libs/temporal/temporal/tempo.h +++ b/libs/temporal/temporal/tempo.h @@ -647,7 +647,7 @@ class LIBTEMPORAL_API TempoMapPoint : public Point, public TempoMetric bool _floating; }; -typedef std::list TempoMapPoints; +typedef std::vector TempoMapPoints; class /*LIBTEMPORAL_API*/ TempoMap : public PBD::StatefulDestructible { @@ -913,7 +913,6 @@ class /*LIBTEMPORAL_API*/ TempoMap : public PBD::StatefulDestructible LIBTEMPORAL_API BBT_Argument bbt_walk (BBT_Argument const &, BBT_Offset const &) const; LIBTEMPORAL_API void get_grid (TempoMapPoints & points, superclock_t start, superclock_t end, uint32_t bar_mod = 0, uint32_t beat_div = 1) const; - LIBTEMPORAL_API uint32_t count_bars (Beats const & start, Beats const & end) const; struct EmptyTempoMapException : public std::exception { virtual const char* what() const throw() { return "TempoMap is empty"; }