temporal: remove useless _floating member and API from TempoMapPoint
This commit is contained in:
parent
ed43ac3a28
commit
81384537ef
@ -773,19 +773,6 @@ MusicTimePoint::set_name (std::string const & str)
|
|||||||
/* XXX need a signal or something to announce change */
|
/* XXX need a signal or something to announce change */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
TempoMapPoint::start_float ()
|
|
||||||
{
|
|
||||||
_floating = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
TempoMapPoint::end_float ()
|
|
||||||
{
|
|
||||||
_floating = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* TEMPOMAP */
|
/* TEMPOMAP */
|
||||||
|
|
||||||
TempoMap::TempoMap (Tempo const & initial_tempo, Meter const & initial_meter)
|
TempoMap::TempoMap (Tempo const & initial_tempo, Meter const & initial_meter)
|
||||||
|
@ -628,23 +628,15 @@ class LIBTEMPORAL_API TempoMapPoint : public Point, public TempoMetric
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
TempoMapPoint (TempoMap const & map, TempoMetric const & tm, superclock_t sc, Beats const & q, BBT_Time const & bbt)
|
TempoMapPoint (TempoMap const & map, TempoMetric const & tm, superclock_t sc, Beats const & q, BBT_Time const & bbt)
|
||||||
: Point (map, sc, q, bbt), TempoMetric (tm), _floating (false) {}
|
: Point (map, sc, q, bbt), TempoMetric (tm) {}
|
||||||
~TempoMapPoint () {}
|
~TempoMapPoint () {}
|
||||||
|
|
||||||
/* called by a GUI that is manipulating the position of this point */
|
|
||||||
void start_float ();
|
|
||||||
void end_float ();
|
|
||||||
bool floating() const { return _floating; }
|
|
||||||
|
|
||||||
bool is_explicit_meter() const { return _meter->sclock() == sclock(); }
|
bool is_explicit_meter() const { return _meter->sclock() == sclock(); }
|
||||||
bool is_explicit_tempo() const { return _tempo->sclock() == sclock(); }
|
bool is_explicit_tempo() const { return _tempo->sclock() == sclock(); }
|
||||||
bool is_explicit_position() const { return false; }
|
bool is_explicit_position() const { return false; }
|
||||||
bool is_explicit () const { return is_explicit_meter() || is_explicit_tempo() || is_explicit_position(); }
|
bool is_explicit () const { return is_explicit_meter() || is_explicit_tempo() || is_explicit_position(); }
|
||||||
|
|
||||||
timepos_t time() const { if (is_explicit_meter()) { return _meter->time(); } else if (is_explicit_tempo()) { return _tempo->time(); } else { return timepos_t::from_superclock (sclock()); } }
|
timepos_t time() const { if (is_explicit_meter()) { return _meter->time(); } else if (is_explicit_tempo()) { return _tempo->time(); } else { return timepos_t::from_superclock (sclock()); } }
|
||||||
|
|
||||||
private:
|
|
||||||
bool _floating;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef std::vector<TempoMapPoint> TempoMapPoints;
|
typedef std::vector<TempoMapPoint> TempoMapPoints;
|
||||||
|
Loading…
Reference in New Issue
Block a user