smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-29 01:47:43 +01:00
Code Issues Projects Releases Wiki Activity

some more removals related to Temporal timeline type conversion (RoundMode now in Temporal)

Browse source
This commit is contained in:
Paul Davis 2020-10-01 10:31:36 -06:00
parent b5c945e211
commit a4b71476e4
2 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/ardour/ardour/tempo.h
View file

@ -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();

8
libs/ardour/ardour/types.h
View file

@ -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)