X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-sequence.cc;h=1c8e0a235299b297237ac0dc58381e778eacaeef;hb=d7dc509525cc1f5b8b670e5d38db44a546674b86;hp=44ec103c4092f7f8ab39769b6f6d80fec7125302;hpb=675533acf58b9b863adc830f175696735ca6dc95;p=lilypond.git diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc index 44ec103c40..1c8e0a2352 100644 --- a/lily/music-sequence.cc +++ b/lily/music-sequence.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2002 Han-Wen Nienhuys + (c) 1998--2003 Han-Wen Nienhuys */ #include "music-list.hh" @@ -28,8 +28,8 @@ Music_sequence::append_music (Music *m) scm_gc_unprotect_object (m->self_scm ()); } -Music_sequence::Music_sequence (SCM l) - : Music (l) +Music_sequence::Music_sequence ( ) + : Music () { } @@ -54,7 +54,7 @@ Music_sequence::cumulative_length (SCM l) for (SCM s = l; gh_pair_p (s); s = ly_cdr (s)) { - Moment l = unsmob_music (ly_car (s))->length_mom (); + Moment l = unsmob_music (ly_car (s))->get_length (); if (last_len.grace_part_ && l.main_part_) { last_len.grace_part_ = Rational (0); @@ -83,7 +83,7 @@ Music_sequence::maximum_length (SCM l) for (SCM s = l; gh_pair_p (s); s = ly_cdr (s)) { Music * m = unsmob_music (ly_car (s)); - Moment l = m->length_mom (); + Moment l = m->get_length (); dur = dur >? l; } @@ -134,12 +134,6 @@ Music_sequence::compress_list (SCM l, Moment m) ADD_MUSIC (Music_sequence); -Music_sequence::Music_sequence () - : Music (SCM_EOL) -{ - -} - Moment Music_sequence::minimum_start (SCM l) { @@ -160,7 +154,7 @@ Music_sequence::first_start (SCM l) for (SCM s = l; gh_pair_p (s); s = ly_cdr (s)) { Music * mus = unsmob_music (ly_car (s)); - Moment l = mus->length_mom (); + Moment l = mus->get_length (); Moment s = mus->start_mom (); if (l.to_bool () || s.to_bool ()) return s;