2003 -> 2004

[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 138a4ddcf1c181734e182b0c3846e86e98535c82..938a7a9c2d36e26da32714a2040fcb5a7e1aa22f 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--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -17,7 +17,6 @@
 class Lyric_combine_music_iterator : public Music_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
   Lyric_combine_music_iterator ();
   Lyric_combine_music_iterator (Lyric_combine_music_iterator const&src);
   DECLARE_SCHEME_CALLBACK(constructor, ());
@@ -30,6 +29,7 @@ protected:
 
   virtual bool ok () const;
   virtual void derived_mark () const;
+  virtual void derived_substitute (Translator_group*,Translator_group*) ;
 private:
   bool get_busy_status ()const ;
   bool melisma_busy (); 
@@ -96,6 +96,15 @@ Lyric_combine_music_iterator::derived_mark()const
     scm_gc_mark (lyric_iter_->self_scm());
 }
 
+void
+Lyric_combine_music_iterator::derived_substitute (Translator_group*f,Translator_group* t)
+{
+  if (music_iter_)
+    music_iter_->substitute_outlet (f,t);
+  if (lyric_iter_)
+    lyric_iter_->substitute_outlet (f,t);
+}
+
 void
 Lyric_combine_music_iterator::construct_children ()
 {
@@ -115,7 +124,7 @@ Lyric_combine_music_iterator::get_busy_status () const
   if (try_music (busy_req))
     return true;
   
-  Translator_group * tr = music_iter_->report_to ();
+  Translator_group * tr = music_iter_->get_outlet ();
 
   SCM grobs = tr->get_property ("busyGrobs");
   Moment now = tr->now_mom();
@@ -141,7 +150,7 @@ bool
 Lyric_combine_music_iterator::melisma_busy ()
 {
   /*
-    We can not read the property, since music_iter_->report_to() might
+    We can not read the property, since music_iter_->get_outlet () might
     not be the context that sets the melisma properties, but rather a
     parent context.
    */
@@ -173,23 +182,6 @@ Lyric_combine_music_iterator::do_quit ()
     lyric_iter_->quit();
 }
 
-Lyric_combine_music_iterator::Lyric_combine_music_iterator (Lyric_combine_music_iterator const & src)
-    : Music_iterator (src)
-{
-  lyric_iter_ = 0;
-  music_iter_ = 0;
-
-  if (src.lyric_iter_)
-    lyric_iter_ =  src.lyric_iter_->clone ();
-  if (src.music_iter_)
-    music_iter_ =  src.music_iter_->clone ();
-
-  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 *m) const
 {