ardour/livetrax
13
0
Fork 0
Code

collect together modifying TempoMap methods, and make ::apply_with_metrics() more clearly const

Browse Source
This commit is contained in:
Paul Davis 2020-11-25 11:01:09 -07:00
parent c434289973
commit dade9994d8
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor.h
View File

@ -1803,7 +1803,7 @@ private:
Curves tempo_curves;
void remove_metric_marks ();
void draw_metric_marks (Temporal::TempoMap::Metrics& metrics);
void draw_metric_marks (Temporal::TempoMap::Metrics const & metrics);
void compute_current_bbt_points (Temporal::TempoMapPoints& grid, samplepos_t left, samplepos_t right);

4
gtk2_ardour/editor_tempodisplay.cc
View File

@ -89,7 +89,7 @@ struct CurveComparator {
}
};
void
Editor::draw_metric_marks (TempoMap::Metrics& metrics)
Editor::draw_metric_marks (TempoMap::Metrics const & metrics)
{
char buf[64];
TempoPoint* prev_ts = 0;
@ -99,7 +99,7 @@ Editor::draw_metric_marks (TempoMap::Metrics& metrics)
remove_metric_marks (); // also clears tempo curves
for (TempoMap::Metrics::iterator i = metrics.begin(); i != metrics.end(); ++i) {
for (TempoMap::Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) {
Temporal::MeterPoint *ms;
Temporal::TempoPoint *ts;

46
libs/temporal/temporal/tempo.h
View File

@ -630,6 +630,11 @@ class LIBTEMPORAL_API TempoMap : public PBD::StatefulDestructible
void sample_rate_changed (samplecnt_t new_sr);
/* methods which modify the map. These must all be called using
* RCU-style semantics: get a writable copy, modify it, then update via
* the RCU manager.
*/
bool set_ramped (TempoPoint&, bool);
void insert_time (timepos_t const & pos, timecnt_t const & duration);
@ -656,6 +661,24 @@ class LIBTEMPORAL_API TempoMap : public PBD::StatefulDestructible
bool move_tempo (TempoPoint const & point, timepos_t const & destination, bool push = false);
bool move_meter (MeterPoint const & point, timepos_t const & destination, bool push = false);
TimeDomain time_domain() const { return _time_domain; }
void set_time_domain (TimeDomain td);
/* END OF MODIFYING METHODS */
typedef std::list<Point*> Metrics;
template<class T> void apply_with_metrics (T& obj, void (T::*method)(Metrics const &)) {
Metrics metrics;
for (Tempos::iterator t = _tempos.begin(); t != _tempos.end(); ++t) {
metrics.push_back (&*t);
}
for (Meters::iterator m = _meters.begin(); m != _meters.end(); ++m) {
metrics.push_back (&*m);
}
(obj.*method)(metrics);
}
bool can_remove (TempoPoint const &) const;
bool can_remove (MeterPoint const &) const;
@ -708,13 +731,6 @@ class LIBTEMPORAL_API TempoMap : public PBD::StatefulDestructible
samplepos_t sample_at (BBT_Time const & b, samplecnt_t sr) const { return superclock_to_samples (superclock_at (b), sr); }
samplepos_t sample_at (timepos_t const & t, samplecnt_t sr) const { return superclock_to_samples (superclock_at (t), sr); }
#if 0
int update_music_times (int gen, samplepos_t, Beats & b, BBT_Time & bbt, bool force);
int update_samples_and_beat_times (int gen, BBT_Time const & bbt, samplepos_t & pos, Beats & b, bool force);
int update_samples_and_bbt_times (int gen, Beats const & b, samplepos_t & pos, BBT_Time & bbt, bool force);
void update_one_domain_from_another (timepos_t const & src, void* dst, TimeDomain) const;
#endif
/* ways to walk along the tempo map, measure distance between points,
* etc.
*/
@ -735,24 +751,8 @@ class LIBTEMPORAL_API TempoMap : public PBD::StatefulDestructible
BBT_Time bbt_walk (BBT_Time const &, BBT_Offset const &) const;
TimeDomain time_domain() const { return _time_domain; }
void set_time_domain (TimeDomain td);
void get_grid (TempoMapPoints& points, superclock_t start, superclock_t end, uint32_t bar_mod = 0);
typedef std::list<Point*> Metrics;
template<class T> void apply_with_metrics (T& obj, void (T::*method)(Metrics &)) {
Metrics metrics;
for (Tempos::iterator t = _tempos.begin(); t != _tempos.end(); ++t) {
metrics.push_back (&*t);
}
for (Meters::iterator m = _meters.begin(); m != _meters.end(); ++m) {
metrics.push_back (&*m);
}
(obj.*method)(metrics);
}
struct EmptyTempoMapException : public std::exception {
virtual const char* what() const throw() { return "TempoMap is empty"; }
};