patch::: 1.3.47.jcn3

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

diff --git a/lily/music-list.cc b/lily/music-list.cc
index 7c47ded02722de0c675d8a534f2b8b57704609ac..abe444cf6f42f330a23668ffbdccc823fed85250 100644 (file)
--- a/lily/music-list.cc
+++ b/lily/music-list.cc
@@ -3,35 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
-
 #include "music-list.hh"
+#include "music-wrapper.hh"
 #include "musical-pitch.hh"
 #include "request.hh"
 #include "musical-request.hh"
-
-
-IMPLEMENT_IS_TYPE_B1(Sequential_music,Music_sequence);
-IMPLEMENT_IS_TYPE_B1(Simultaneous_music,Music_sequence);
+#include "music-iterator.hh"
+#include "main.hh"
+#include "killing-cons.tcc"
 
 Moment
-Simultaneous_music::duration () const
+Simultaneous_music::length_mom () const
 {
-  Moment dur = 0;
-  for (iter (music_p_list_p_->top(), i); i.ok (); i++)
-    dur = dur >? i->duration ();
-
-  return dur;
+  return maximum_length ();
 }
 
+
 void
 Music_sequence::compress (Moment m)
 {
-  for (PCursor<Music*>  i(music_p_list_p_->top()); i.ok (); i++)
-    i->compress (m);
+  for (Cons<Music> *i = music_p_list_p_->head_; i;  i = i->next_)
+    i->car_->compress (m);
 }
 
 Simultaneous_music::Simultaneous_music(Music_list *p)
@@ -46,26 +41,22 @@ Sequential_music::Sequential_music(Music_list *p)
 }
 
 Moment
-Sequential_music::duration () const
+Sequential_music::length_mom () const
 {
-  Moment last=0;
-  for (iter (music_p_list_p_->top(), i); i.ok (); i++) 
-    {
-      last += i->duration ();
-    }
-  return  last;
+  return cumulative_length ();
 }
 
 Musical_pitch
-Sequential_music::to_relative_octave (Musical_pitch p)
+Simultaneous_music::to_relative_octave (Musical_pitch p)
 {
-  return music_p_list_p_->do_relative_octave (p, false);
+  return do_relative_octave (p, true);
 }
 
+
 Musical_pitch
-Simultaneous_music::to_relative_octave (Musical_pitch p)
+Music_sequence::do_relative_octave (Musical_pitch p, bool b)
 {
-  return music_p_list_p_->do_relative_octave (p, true);
+  return music_p_list_p_->do_relative_octave (p, b);  
 }
 
 
@@ -74,54 +65,51 @@ Music_list::do_relative_octave (Musical_pitch last, bool ret_first)
 {
   Musical_pitch retval;
   int count=0;
-  for (PCursor<Music*> i (top ()); i.ok (); i++)
+  for (Cons<Music> *i = head_; i ; i = i->next_)
     {
-      last = i->to_relative_octave (last);
+      last = i->car_->to_relative_octave (last);
       if (!count ++ )
        retval = last;
     }
+
   if (!ret_first)
     retval = last;
+  
   return retval;
 }
 
 
 Music_list::Music_list (Music_list const &s)
-  : Pointer_list<Music*> ()
+  : Cons_list<Music> (s), Input (s)
 {
-  for (PCursor<Music*> i(s.top()); i.ok (); i++)
-    add_music (i->clone());
+  Cons_list<Music>::init ();
+  clone_killing_cons_list (*this, s.head_);
 }
 
+
 void
 Music_list::add_music (Music*m_p)
 {
   if (!m_p)
     return;
 
-  bottom().add (m_p);
+  append (new Killing_cons<Music> (m_p, 0));
 }
 
-
-IMPLEMENT_IS_TYPE_B1(Request_chord, Simultaneous_music);
-
-
 Request_chord::Request_chord()
   : Simultaneous_music (new Music_list)
 {
-  multi_level_i_ =0;
 }
 
 
 Musical_pitch
 Request_chord::to_relative_octave (Musical_pitch last)
 {
-  for (iter (music_p_list_p_->top(),i); i.ok (); i++)
+  for (Cons<Music> *i = music_p_list_p_->head_; i ; i = i->next_)
     {
-      Musical_req *m = dynamic_cast<Musical_req*> (i.ptr ());
-      if (m && dynamic_cast <Melodic_req *> (m))
+      if (Melodic_req *m= dynamic_cast <Melodic_req *> (i->car_))
        {
-         Musical_pitch &pit = dynamic_cast <Melodic_req *> (m)->pitch_;
+         Musical_pitch &pit = m->pitch_;
          pit.to_relative_octave (last);
          return pit;
        }
@@ -131,6 +119,10 @@ Request_chord::to_relative_octave (Musical_pitch last)
 
 
 Music_list::Music_list ()
-  : Pointer_list<Music*> ()
 {
 }
+
+Music_sequence::~Music_sequence ()
+{
+  delete music_p_list_p_;
+}