partial: 1.3.13.jcn

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

diff --git a/lily/music-list.cc b/lily/music-list.cc
index 01ccd5be0fa9ffb0e27c8b5822df9b54cee4d563..2b2fce2fda216187f7917b1cb343cfcba5073df9 100644 (file)
--- a/lily/music-list.cc
+++ b/lily/music-list.cc
@@ -7,22 +7,21 @@
 */
 
 #include "music-list.hh"
+#include "music-wrapper.hh"
 #include "musical-pitch.hh"
 #include "request.hh"
 #include "musical-request.hh"
+#include "music-iterator.hh"
 #include "main.hh"
 #include "killing-cons.tcc"
 
 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)
 {
@@ -44,18 +43,7 @@ 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;
-}
-
-Musical_pitch
-Sequential_music::to_relative_octave (Musical_pitch p)
-{
-  return do_relative_octave (p, false);
+  return cumulative_length ();
 }
 
 Musical_pitch
@@ -64,12 +52,14 @@ Simultaneous_music::to_relative_octave (Musical_pitch p)
   return do_relative_octave (p, true);
 }
 
+
 Musical_pitch
 Music_sequence::do_relative_octave (Musical_pitch p, bool b)
 {
   return music_p_list_p_->do_relative_octave (p, b);  
 }
 
+
 Musical_pitch 
 Music_list::do_relative_octave (Musical_pitch last, bool ret_first)
 {
@@ -90,9 +80,9 @@ Music_list::do_relative_octave (Musical_pitch last, bool ret_first)
 
 
 Music_list::Music_list (Music_list const &s)
-  : Cons_list<Music> (s)
+  : Cons_list<Music> (s), Input (s)
 {
-  init_list ();
+  Cons_list<Music>::init ();
   clone_killing_cons_list (*this, s.head_);
 }
 
@@ -131,3 +121,8 @@ Request_chord::to_relative_octave (Musical_pitch last)
 Music_list::Music_list ()
 {
 }
+
+Music_sequence::~Music_sequence ()
+{
+  delete music_p_list_p_;
+}