release: 1.1.43

[lilypond.git] / lily / music-list.cc

diff --git a/lily/music-list.cc b/lily/music-list.cc
index 0324d8af6c5207acef113262841365fe03c9bd63..1d32d1d08d4bff3307ed35407352dabee705adc6 100644 (file)
--- a/lily/music-list.cc
+++ b/lily/music-list.cc
@@ -16,17 +16,14 @@
 Moment
 Simultaneous_music::length_mom () const
 {
-  Moment dur = 0;
-  for (Cons<Music> *i = music_p_list_p_->head_; i;  i = i->next_)
-    dur = dur >? i->car_->length_mom ();
-
-  return dur;
+  return maximum_length ();
 }
 
+
+
 void
 Music_sequence::compress (Moment m)
 {
-  
   for (Cons<Music> *i = music_p_list_p_->head_; i;  i = i->next_)
     i->car_->compress (m);
 }
@@ -45,19 +42,9 @@ Sequential_music::Sequential_music(Music_list *p)
 Moment
 Sequential_music::length_mom () const
 {
-  Moment last=0;
-  for (Cons<Music> *i = music_p_list_p_->head_; i;  i = i->next_)
-    {
-      last += i->car_->length_mom ();
-    }
-  return  last;
+  return cumulative_length ();
 }
 
-Musical_pitch
-Sequential_music::to_relative_octave (Musical_pitch p)
-{
-  return do_relative_octave (p, false);
-}
 
 Musical_pitch
 Simultaneous_music::to_relative_octave (Musical_pitch p)
@@ -93,7 +80,7 @@ Music_list::do_relative_octave (Musical_pitch last, bool ret_first)
 Music_list::Music_list (Music_list const &s)
   : Cons_list<Music> (s)
 {
-  init_list ();
+  Cons_list<Music>::init ();
   clone_killing_cons_list (*this, s.head_);
 }