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 9702b8358b6cae573fee16bb02b9ac29bccaa66e..a3b54fc386f4fde3d934b8df6f14d33b1efd400c 100644 (file)
--- 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);