diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index 8caad9a5eb..f6a857e7cd 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -424,9 +424,9 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible void replace_meter (const MeterSection&, const Meter&, const Temporal::BBT_Time& where, samplepos_t sample, PositionLockStyle pls); - MusicSample round_to_bar (samplepos_t sample, RoundMode dir); - MusicSample round_to_beat (samplepos_t sample, RoundMode dir); - MusicSample round_to_quarter_note_subdivision (samplepos_t fr, int sub_num, RoundMode dir); + MusicSample round_to_bar (samplepos_t sample, Temporal::RoundMode dir); + MusicSample round_to_beat (samplepos_t sample, Temporal::RoundMode dir); + MusicSample round_to_quarter_note_subdivision (samplepos_t fr, int sub_num, Temporal::RoundMode dir); void set_length (samplepos_t samples); @@ -611,7 +611,7 @@ private: void recompute_meters (Metrics& metrics); void recompute_map (Metrics& metrics, samplepos_t end = -1); - MusicSample round_to_type (samplepos_t fr, RoundMode dir, BBTPointType); + MusicSample round_to_type (samplepos_t fr, Temporal::RoundMode dir, BBTPointType); const MeterSection& first_meter() const; MeterSection& first_meter(); diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 5dd927cf03..0df1cdf9e8 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -254,14 +254,6 @@ enum ColorMode { TrackColor }; -enum RoundMode { - RoundDownMaybe = -2, ///< Round down only if necessary - RoundDownAlways = -1, ///< Always round down, even if on a division - RoundNearest = 0, ///< Round to nearest - RoundUpAlways = 1, ///< Always round up, even if on a division - RoundUpMaybe = 2 ///< Round up only if necessary -}; - enum SnapPref { SnapToAny_Visual = 0, /**< Snap to the editor's visual snap * (incoprorating snap prefs and the current zoom scaling)