CG: add some major release notes.

[lilypond.git] / lily / staff-performer.cc

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 2fd85fe48286920492a440b77fc1e7b4cccf357e..bab8ae025748282b47bb2f49b4035d737f2baedf 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -105,6 +105,8 @@ Audio_staff*
 Staff_performer::new_audio_staff (string voice)
 {
   Audio_staff* audio_staff = new Audio_staff;
+  audio_staff->merge_unisons_
+    = to_boolean (get_property ("midiMergeUnisons"));
   string track_name = context ()->id_string () + ":" + voice;
   if (track_name != ":")
     {
@@ -261,7 +263,7 @@ Staff_performer::acknowledge_audio_element (Audio_element_info inf)
       string str = new_instrument_string ();
       if (channel_mapping != ly_symbol2scm ("instrument"))
        channel_ = get_channel (voice);
-      else if (str.empty ())
+      else if (channel_ < 0 && str.empty ())
        channel_ = get_channel (str);
       if (str.length ())
        {