patch::: 1.3.8.uu1

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

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 52ed3fecce83e604c9b6ddfdbc61785fac61977c..60e6459a20f7e850ce1a4a4ca5186c239ff91694 100644 (file)
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -26,16 +26,16 @@ Music_sequence::Music_sequence(Music_list *mlist_p)
 void
 Music_sequence::transpose (Musical_pitch rq)
 {
-  for (Cons<Music> *i = music_p_list_p_->head_cons_p_; i;  i = i->next_cons_p_)
-    i->car_p_->transpose (rq);    
+  for (Cons<Music> *i = music_p_list_p_->head_; i;  i = i->next_)
+    i->car_->transpose (rq);    
 }
 
 void
 Music_sequence::do_print() const
 {
 #ifndef NPRINT
-  for (Cons<Music> *i = music_p_list_p_->head_cons_p_; i;  i = i->next_cons_p_)  
-    i->car_p_->print();
+  for (Cons<Music> *i = music_p_list_p_->head_; i;  i = i->next_)  
+    i->car_->print();
 #endif 
 }
 
@@ -45,3 +45,36 @@ Music_sequence::add_music (Music *m_p)
 {
   music_p_list_p_->add_music (m_p);
 }
+
+Moment
+Music_sequence::cumulative_length () 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
+Music_sequence::to_relative_octave (Musical_pitch p)
+{
+  return do_relative_octave (p, false);
+}
+
+
+Moment
+Music_sequence::maximum_length () 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;
+}
+int
+Music_sequence::length_i () const
+{
+  return cons_list_size_i (music_p_list_p_->head_);
+}