* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / lily / lyric-combine-music-iterator.cc

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index 6d4cdc6bee322b6f0d84151f0f8a6a86ee352af4..127945b3d6276e47848c17c2f7b76560bbc3e3ce 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,99 +11,149 @@
 #include "lyric-combine-music-iterator.hh"
 #include "lyric-combine-music.hh"
 #include "musical-request.hh"
+#include "note-head.hh"
+#include "grob.hh"
 
-Busy_playing_req busy_req;
-Melisma_req melisma_start_req;
-Melisma_req melisma_stop_req;
-Melisma_playing_req melisma_playing_req;
 
+/*
+  Ugh, why static?
+ */
+Busy_playing_req *busy_req;
+Melisma_req *melisma_start_req;
+Melisma_req *melisma_stop_req;
+Melisma_playing_req * melisma_playing_req;
 
 Lyric_combine_music_iterator::Lyric_combine_music_iterator ()
 {
-  melisma_start_req.span_dir_ = START;
-  melisma_stop_req.span_dir_ = STOP;
+  if (!busy_req)
+    {
+      busy_req = new Busy_playing_req;
+      melisma_playing_req = new Melisma_playing_req;
+      melisma_stop_req = new Melisma_req;
+      melisma_start_req = new Melisma_req;      
+      melisma_start_req->set_span_dir (START);
+      melisma_stop_req->set_span_dir (STOP);
+    }
   
-  music_iter_p_ =0;
-  lyric_iter_p_ =0;
+  music_iter_ =0;
+  lyric_iter_ =0;
 }
 
 Moment
-Lyric_combine_music_iterator::next_moment () const
+Lyric_combine_music_iterator::pending_moment () const
 {
-  Moment musnext = music_iter_p_->next_moment ();
+  Moment musnext = music_iter_->pending_moment ();
   return musnext;
 }
 
 bool
 Lyric_combine_music_iterator::ok () const
 {
-  return music_iter_p_->ok ();
+  return music_iter_->ok ();
 }
 
 void
-Lyric_combine_music_iterator::do_print () const
+Lyric_combine_music_iterator::derived_mark()const
 {
-  music_iter_p_->print ();
-  lyric_iter_p_->print ();
+  if (music_iter_)
+    scm_gc_mark (music_iter_->self_scm());
+  if (lyric_iter_)
+    scm_gc_mark (lyric_iter_->self_scm());
 }
 
 void
 Lyric_combine_music_iterator::construct_children ()
 {
-  Lyric_combine_music const * m = dynamic_cast<Lyric_combine_music const*> (music_l_);
+  Lyric_combine_music const * m = dynamic_cast<Lyric_combine_music const*> (get_music ());
+  
+  music_iter_ = unsmob_iterator (get_iterator (m->get_music ()));
+  lyric_iter_ = unsmob_iterator (get_iterator (m->get_lyrics ()));
+}
+
+bool
+Lyric_combine_music_iterator::get_busy_status () const
+{
+  /*
+    We have to use both the request and the busyGrobs queue.  The
+    busyGrobs queue doesn't contain any notes that have started this
+    instant.  */
+  if (try_music (busy_req))
+    return true;
   
-  music_iter_p_ = get_iterator_p (m->music_l ());
-  lyric_iter_p_ = get_iterator_p (m->lyrics_l ());
+  Translator_group * tr = music_iter_->report_to ();
+
+  SCM grobs = tr->get_property ("busyGrobs");
+  Moment now = tr->now_mom();
+  for (; gh_pair_p (grobs); grobs = gh_cdr (grobs))
+    {
+      SCM grob = gh_cdar (grobs);
+      Moment end  =*unsmob_moment (gh_caar (grobs));
+
+      
+      /*
+       This is slightly ugh: we are now confunding the frontend
+       (iterators) and the backend (note heads) */
+      if (end > now
+         && Note_head::has_interface (unsmob_grob (grob)))
+       return true;
+    }
+
+  return false;
 }
 
 void
-Lyric_combine_music_iterator::do_process_and_next (Moment m)
+Lyric_combine_music_iterator::process (Moment m)
 {
-  Moment my_next = music_iter_p_->next_moment ();
+  Moment my_next = music_iter_->pending_moment ();
   if (my_next > m)
     return;
   
-  music_iter_p_->process_and_next (m);
+  music_iter_->process (m);
 
-  bool busy = try_music (&busy_req);
-  if (busy)
+  if (get_busy_status ())
     {
-      bool melisma_b = try_music (&melisma_playing_req);
+      bool melisma_b = try_music (melisma_playing_req);
       if (!melisma_b)
        {
-         if (lyric_iter_p_->ok ())
+         if (lyric_iter_->ok ())
            {
-#if 0                          // devise a new way for this
-             if (melisma_b && !melisma_started_b_)
-               lyric_iter_p_->try_music (&melisma_start_req);
-             else if (melisma_started_b_)
-               lyric_iter_p_->try_music (&melisma_stop_req);
-#endif
-             
-             Moment m= lyric_iter_p_->next_moment ();
-             lyric_iter_p_->process_and_next (m);
+             Moment m= lyric_iter_->pending_moment ();
+             lyric_iter_->process (m);
            }
        }
     }
   
-
+}
+void
+Lyric_combine_music_iterator::do_quit ()
+{
+  if (music_iter_)
+    music_iter_->quit();
+  if (lyric_iter_)
+    lyric_iter_->quit();
   
-  Music_iterator::do_process_and_next (m);
 }
-
-Lyric_combine_music_iterator::~Lyric_combine_music_iterator ()
+Lyric_combine_music_iterator::Lyric_combine_music_iterator (Lyric_combine_music_iterator const & src)
+    : Music_iterator (src)
 {
-  delete lyric_iter_p_;
-  delete music_iter_p_;
+  lyric_iter_ = src.lyric_iter_ ? src.lyric_iter_->clone () : 0;
+  music_iter_ = src.music_iter_ ? src.music_iter_->clone () : 0;  
+
+  if (lyric_iter_)
+    scm_gc_unprotect_object (lyric_iter_->self_scm());
+  if (music_iter_)
+    scm_gc_unprotect_object (music_iter_->self_scm());
 }
 
 Music_iterator*
-Lyric_combine_music_iterator::try_music_in_children (Music const *m) const
+Lyric_combine_music_iterator::try_music_in_children (Music *m) const
 {
-  Music_iterator * i =  music_iter_p_->try_music (m);
+  Music_iterator * i =  music_iter_->try_music (m);
   if (i)
     return i;
   else
-    return lyric_iter_p_->try_music (m);
+    return lyric_iter_->try_music (m);
 }
 
+
+IMPLEMENT_CTOR_CALLBACK (Lyric_combine_music_iterator);