ardour/livetrax
13
0
Fork 0
Code

temporal: implement copy operator and operator= for TempoMap

Browse Source
This commit is contained in:
Paul Davis 2020-12-30 21:06:19 -07:00
parent 146b432c51
commit 657350455e
2 changed files with 54 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
libs/temporal/tempo.cc
View File

@ -17,6 +17,7 @@
*/
#include <algorithm>
#include <vector>
#include "pbd/error.h"
#include "pbd/i18n.h"
@ -635,11 +636,49 @@ TempoMap::TempoMap (XMLNode const & node, int version)
TempoMap::TempoMap (TempoMap const & other)
: _time_domain (other.time_domain())
{
#warning NUTEMPO since these lists are intrusive we must actually rebuild them
// _meters = other._meters;
// _bartimes = other._bartimes;
// _points = other._points;
// _tempos = other._tempos;
copy_points (other);
}
TempoMap&
TempoMap::operator= (TempoMap const & other)
{
_time_domain = other.time_domain();
copy_points (other);
}
void
TempoMap::copy_points (TempoMap const & other)
{
std::vector<Point*> p;
p.reserve (other._meters.size() + other._tempos.size() + other._bartimes.size());
for (Meters::const_iterator m = other._meters.begin(); m != other._meters.end(); ++m) {
MeterPoint* mp = new MeterPoint (*m);
_meters.push_back (*mp);
p.push_back (mp);
}
for (Tempos::const_iterator t = other._tempos.begin(); t != other._tempos.end(); ++t) {
TempoPoint* tp = new TempoPoint (*t);
_tempos.push_back (*tp);
p.push_back (tp);
}
for (MusicTimes::const_iterator mt = other._bartimes.begin(); mt != other._bartimes.end(); ++mt) {
MusicTimePoint* mtp = new MusicTimePoint (*mt);
_bartimes.push_back (*mtp);
p.push_back (mtp);
}
sort (p.begin(), p.end(), Point::ptr_sclock_comparator());
for (std::vector<Point*>::iterator pi = p.begin(); pi != p.end(); ++pi) {
_points.push_back (**pi);
}
std::cout << "POST COPY\n";
dump (std::cout);
}
void

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

@ -93,6 +93,12 @@ class LIBTEMPORAL_API Point {
}
};
struct ptr_sclock_comparator {
bool operator() (Point const * a, Point const * b) const {
return a->sclock() < b->sclock();
}
};
struct beat_comparator {
bool operator() (Point const & a, Point const & b) const {
return a.beats() < b.beats();
@ -649,6 +655,8 @@ class LIBTEMPORAL_API TempoMap : public PBD::StatefulDestructible
TempoMap (XMLNode const &, int version);
~TempoMap();
TempoMap& operator= (TempoMap const &);
void sample_rate_changed (samplecnt_t new_sr);
/* methods which modify the map. These must all be called using
@ -833,6 +841,8 @@ class LIBTEMPORAL_API TempoMap : public PBD::StatefulDestructible
void reset_starting_at (superclock_t);
void reset_starting_at (Beats const &);
void copy_points (TempoMap const & other);
};
} /* end of namespace Temporal */