X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpart-combine-iterator.cc;h=06449fb5dca228c13dd6a9daa0269cbce80c400e;hb=e79582f3ec94019a9f849b2855abab4eabae3172;hp=db6b77cbc614f1b7146aa5b925e1eea9d2cde0a8;hpb=09477a6064ff31ca2ea4f3a01c76d6406558260d;p=lilypond.git

diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc
index db6b77cbc6..06449fb5dc 100644
--- a/lily/part-combine-iterator.cc
+++ b/lily/part-combine-iterator.cc
@@ -223,7 +223,9 @@ Part_combine_iterator::kill_mmrest (int in)
 
   if (!mmrest_event_)
     {
-      mmrest_event_ = new Stream_event (ly_symbol2scm ("multi-measure-rest-event"));
+      mmrest_event_ = new Stream_event
+	(handles_[in].get_context ()->make_event_class
+	 (ly_symbol2scm ("multi-measure-rest-event")));
       mmrest_event_->set_property ("duration", SCM_EOL);
       mmrest_event_->unprotect ();
     }
@@ -254,14 +256,15 @@ Part_combine_iterator::unisono (bool silent)
       if (playing_state_ != UNISONO
           && newstate == UNISONO)
         {
+          Context *out = (last_playing_ == SOLO2 ? second_iter_ : first_iter_)
+                         ->get_outlet ();
           if (!unisono_event_)
             {
-              unisono_event_ = new Stream_event (ly_symbol2scm ("unisono-event"));
+              unisono_event_ = new Stream_event
+		(out->make_event_class (ly_symbol2scm ("unisono-event")));
               unisono_event_->unprotect ();
             }
 
-          Context *out = (last_playing_ == SOLO2 ? second_iter_ : first_iter_)
-                         ->get_outlet ();
           out->event_source ()->broadcast (unisono_event_);
           playing_state_ = UNISONO;
         }
@@ -286,7 +289,9 @@ Part_combine_iterator::solo1 ()
         {
           if (!solo_one_event_)
             {
-              solo_one_event_ = new Stream_event (ly_symbol2scm ("solo-one-event"));
+              solo_one_event_ = new Stream_event
+		(first_iter_->get_outlet ()->make_event_class
+		 (ly_symbol2scm ("solo-one-event")));
               solo_one_event_->unprotect ();
             }
 
@@ -311,7 +316,9 @@ Part_combine_iterator::solo2 ()
         {
           if (!solo_two_event_)
             {
-              solo_two_event_ = new Stream_event (ly_symbol2scm ("solo-two-event"));
+              solo_two_event_ = new Stream_event
+		(second_iter_->get_outlet ()->make_event_class
+		 (ly_symbol2scm ("solo-two-event")));
               solo_two_event_->unprotect ();
             }