patch::: 1.4.0.jcn4

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

diff --git a/lily/music-list.cc b/lily/music-list.cc
index a17fad69cf5a7b62fe22248f51380fc0b26ba6e0..e3e188e9e2b7bb55304a350470e6e15d98fd0284 100644 (file)
--- a/lily/music-list.cc
+++ b/lily/music-list.cc
@@ -3,125 +3,94 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "music-list.hh"
-#include "musical-pitch.hh"
+#include "music-wrapper.hh"
+#include "pitch.hh"
 #include "request.hh"
 #include "musical-request.hh"
+#include "music-iterator.hh"
 #include "main.hh"
 #include "killing-cons.tcc"
+#include "simultaneous-music-iterator.hh"
+#include "sequential-music-iterator.hh"
+#include "request-chord-iterator.hh"
 
 Moment
 Simultaneous_music::length_mom () const
 {
-  Moment dur = 0;
-  for (Cons<Music> *i = music_p_list_p_->head_cons_p_; i;  i = i->next_cons_p_)
-    dur = dur >? i->car_p_->length_mom ();
+  return maximum_length ();
+}
 
-  return dur;
+Simultaneous_music::Simultaneous_music (SCM head)
+  : Music_sequence (head)
+{
+  set_mus_property ("iterator-ctor",
+                   Simultaneous_music_iterator::constructor_cxx_function);
 }
 
-void
-Music_sequence::compress (Moment m)
+Simultaneous_music::Simultaneous_music ()
+  : Music_sequence ()
 {
+  set_mus_property ("iterator-ctor",
+                   Simultaneous_music_iterator::constructor_cxx_function);
   
-  for (Cons<Music> *i = music_p_list_p_->head_cons_p_; i;  i = i->next_cons_p_)
-    i->car_p_->compress (m);
 }
 
-Simultaneous_music::Simultaneous_music(Music_list *p)
-  : Music_sequence (p)
+Sequential_music::Sequential_music (SCM head)
+  : Music_sequence (head)
 {
-
+  set_mus_property ("iterator-ctor",
+                   Sequential_music_iterator::constructor_cxx_function);
 }
-
-Sequential_music::Sequential_music(Music_list *p)
-  : Music_sequence (p)
+Sequential_music::Sequential_music ()
+  : Music_sequence ()
 {
+  set_mus_property ("iterator-ctor",
+                   Sequential_music_iterator::constructor_cxx_function);
 }
 
+
 Moment
 Sequential_music::length_mom () const
 {
-  Moment last=0;
-  for (Cons<Music> *i = music_p_list_p_->head_cons_p_; i;  i = i->next_cons_p_)
-    {
-      last += i->car_p_->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)
+Pitch
+Simultaneous_music::to_relative_octave (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)
-{
-  Musical_pitch retval;
-  int count=0;
-  for (Cons<Music> *i = head_cons_p_; i ; i = i->next_cons_p_)
-    {
-      last = i->car_p_->to_relative_octave (last);
-      if (!count ++ )
-       retval = last;
-    }
-
-  if (!ret_first)
-    retval = last;
-  
-  return retval;
-}
-
-
-Music_list::Music_list (Music_list const &s)
-  : Cons_list<Music> (s)
+Request_chord::Request_chord (SCM s)
+  : Simultaneous_music (s)
 {
-  init ();
-  clone_killing_cons_list (*this, s.head_cons_p_);
+  set_mus_property ("iterator-ctor",
+                   Request_chord_iterator::constructor_cxx_function);
 }
 
-
-void
-Music_list::add_music (Music*m_p)
+Request_chord::Request_chord ()
 {
-  if (!m_p)
-    return;
-
-  append (new Killing_cons<Music> (m_p, 0));
+  set_mus_property ("iterator-ctor",
+                   Request_chord_iterator::constructor_cxx_function);
 }
 
-Request_chord::Request_chord()
-  : Simultaneous_music (new Music_list)
+Pitch
+Request_chord::to_relative_octave (Pitch last)
 {
-}
-
-
-Musical_pitch
-Request_chord::to_relative_octave (Musical_pitch last)
-{
-  for (Cons<Music> *i = music_p_list_p_->head_cons_p_; i ; i = i->next_cons_p_)
+  for (SCM s = music_list (); gh_pair_p (s);  s = gh_cdr (s))
     {
-      if (Melodic_req *m= dynamic_cast <Melodic_req *> (i->car_p_))
+      Music * mus = unsmob_music (gh_car (s));
+      if (Melodic_req *m= dynamic_cast <Melodic_req *> (mus))
        {
-         Musical_pitch &pit = m->pitch_;
+         Pitch pit = *unsmob_pitch (m->get_mus_property ("pitch"));
+         
          pit.to_relative_octave (last);
+         m->set_mus_property ("pitch", pit.smobbed_copy ());
+                 
          return pit;
        }
     }
@@ -129,6 +98,7 @@ Request_chord::to_relative_octave (Musical_pitch last)
 }
 
 
-Music_list::Music_list ()
-{
-}
+
+ADD_MUSIC (Simultaneous_music);
+ADD_MUSIC (Sequential_music);
+ADD_MUSIC (Request_chord);