From 59d4193af4939e4d02da2ef62fb0570c66bfea6e Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 22 Dec 1996 17:11:24 +0000 Subject: [PATCH] lilypond-0.0.20 --- hdr/grouping.hh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/hdr/grouping.hh b/hdr/grouping.hh index da1ddd2ce3..d1c9bac139 100644 --- a/hdr/grouping.hh +++ b/hdr/grouping.hh @@ -7,34 +7,36 @@ #ifndef GROUPING_HH #define GROUPING_HH +#include "moment.hh" #include "interval.hh" #include "vray.hh" +typedef Interval_t MInterval; /// data structure which represents rhythmic units struct Rhythmic_grouping { svec children; - Interval *interval_; + MInterval *interval_; /****************/ - svec intervals(); - Interval interval()const; - Real length() const; - void intersect(Interval); + svec intervals(); + MInterval interval()const; + Moment length() const; + void intersect(MInterval); void operator=(Rhythmic_grouping const&); Rhythmic_grouping(Rhythmic_grouping const&); - Rhythmic_grouping(Interval, int n=1); + Rhythmic_grouping(MInterval, int n=1); Rhythmic_grouping(); Rhythmic_grouping(svec); ~Rhythmic_grouping(); - void add_child(Real start, Real len); + void add_child(Moment start, Moment len); void split(Rhythmic_grouping r); - void split(svec); + void split(svec); void split(int n); void print() const; -- 2.39.5