From: Dan Eble <nine.fierce.ballads@gmail.com>
Date: Thu, 28 May 2015 00:56:37 +0000 (-0400)
Subject: Issue 4423: eliminate part combiner's array of context handles (3/4)
X-Git-Tag: release/2.19.22-1~68^2~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b357d2084d1ae252a890e92019e62aa8ccbfdafc;p=lilypond.git

Issue 4423: eliminate part combiner's array of context handles (3/4)

Use NullVoice instead of Devnull for the "null" context.  This makes
all outlets a kind of Voice.
---

diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc
index 9702b8358b..a3b54fc386 100644
--- a/lily/part-combine-iterator.cc
+++ b/lily/part-combine-iterator.cc
@@ -274,7 +274,7 @@ Part_combine_iterator::construct_children ()
 
   for (int i = 0; i < NUM_OUTLETS; i++)
     {
-      SCM type = (i == CONTEXT_NULL) ? ly_symbol2scm ("Devnull") : ly_symbol2scm ("Voice");
+      SCM type = (i == CONTEXT_NULL) ? ly_symbol2scm ("NullVoice") : ly_symbol2scm ("Voice");
       /* find context below c: otherwise we may create new staff for each voice */
       c = c->find_create_context (type, outlet_names_[i], SCM_EOL);
       handles_[i].set_context (c);