From b357d2084d1ae252a890e92019e62aa8ccbfdafc Mon Sep 17 00:00:00 2001
From: Dan Eble <nine.fierce.ballads@gmail.com>
Date: Wed, 27 May 2015 20:56:37 -0400
Subject: [PATCH] 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.
---
lily/part-combine-iterator.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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);
--
2.39.5