X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpart-combine-iterator.cc;h=caa6c73aa89c8e0d28abeb55dbdbcb140d41acae;hb=3639deb950d8c48fdc4d0cc812eb95e1511cd968;hp=006e0024d1b2100b545ebc9a33703e50bcb472a1;hpb=d3c50bb3e14b4ded57e6747ed5d122fabedebecb;p=lilypond.git

diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc
index 006e0024d1..caa6c73aa8 100644
--- a/lily/part-combine-iterator.cc
+++ b/lily/part-combine-iterator.cc
@@ -3,11 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys
+  (c) 2004--2006 Han-Wen Nienhuys
 */
 
 #include "context.hh"
-#include "event.hh"
+#include "music.hh"
 #include "music-sequence.hh"
 #include "lily-guile.hh"
 #include "warn.hh"
@@ -60,11 +60,11 @@ private:
   /*
     TODO: this is getting of hand...
   */
-  Interpretation_context_handle one_;
-  Interpretation_context_handle two_;
-  Interpretation_context_handle null_;
-  Interpretation_context_handle shared_;
-  Interpretation_context_handle solo_;
+  Context_handle one_;
+  Context_handle two_;
+  Context_handle null_;
+  Context_handle shared_;
+  Context_handle solo_;
 
   void substitute_both (Context *to1,
 			Context *to2);
@@ -204,7 +204,7 @@ Part_combine_iterator::substitute_both (Context *to1,
 {
   Context *tos[] = {to1, to2};
   Music_iterator *mis[] = {first_iter_, second_iter_};
-  Interpretation_context_handle *hs[]
+  Context_handle *hs[]
     = {
     &null_,
     &one_, &two_,
@@ -373,10 +373,10 @@ Part_combine_iterator::construct_children ()
     {
       SCM sym = ly_symbol2scm (*p);
       execute_pushpop_property (one, sym,
-				ly_symbol2scm ("direction"), scm_int2num (1));
+				ly_symbol2scm ("direction"), scm_from_int (1));
 
       execute_pushpop_property (two, sym,
-				ly_symbol2scm ("direction"), scm_int2num (-1));
+				ly_symbol2scm ("direction"), scm_from_int (-1));
     }
 }
 
@@ -410,8 +410,8 @@ Part_combine_iterator::process (Moment m)
 	solo2 ();
       else if (scm_is_symbol (tag))
 	{
-	  String s = "Unknown split directive: "
-	    + (scm_is_symbol (tag) ? ly_symbol2string (tag) : String ("not a symbol"));
+	  string s = "Unknown split directive: "
+	    + (scm_is_symbol (tag) ? ly_symbol2string (tag) : string ("not a symbol"));
 	  programming_error (s);
 	}
     }
@@ -426,7 +426,7 @@ Part_combine_iterator::process (Moment m)
   if (second_iter_->ok ())
     {
       second_iter_->process (m);
-      if (first_iter_->try_music_in_children (busy_playing_event))
+      if (second_iter_->try_music_in_children (busy_playing_event))
 	last_playing_ = SOLO2;
     }
 }