Doc: NR renamed 'New spacing area' node

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

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index f635130b70267db6d154432c18447a3dc76acd92..26781f0dcd5b53529d6f1ba986b011cdfc73a09a 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -27,6 +27,9 @@
 #include "international.hh"
 #include "performer-group.hh"
 #include "warn.hh"
+#include "lily-imports.hh"
+
+#include "translator.icc"
 
 /* Perform a staff. Individual notes should have their instrument
   (staff-wide) set, so we override play_element ()
@@ -76,8 +79,6 @@ map<string, int> Staff_performer::static_channel_map_;
 int Staff_performer::channel_count_ = 0;
 int Staff_performer::staff_performer_count_ = 0;
 
-#include "translator.icc"
-
 ADD_TRANSLATOR (Staff_performer,
                 /* doc */
                 "",
@@ -199,8 +200,7 @@ Staff_performer::set_instrument (int channel, const string &voice)
   announce_element (Audio_element_info (instrument_, 0));
   Audio_staff *audio_staff = get_audio_staff (voice);
   audio_staff->add_audio_item (instrument_);
-  SCM proc = ly_lily_module_constant ("percussion?");
-  SCM drums = scm_call_1 (proc, ly_symbol2scm (instrument_string_.c_str ()));
+  SCM drums = Lily::percussion_p (ly_symbol2scm (instrument_string_.c_str ()));
   audio_staff->percussion_ = to_boolean (drums);
 }
 
@@ -331,6 +331,7 @@ Staff_performer::acknowledge_audio_element (Audio_element_info inf)
           set_instrument_name (voice);
         }
       ai->channel_ = channel_;
+      Audio_staff *audio_staff = get_audio_staff (voice);
       bool encode_dynamics_as_velocity_ = true;
       if (encode_dynamics_as_velocity_)
         {
@@ -344,11 +345,11 @@ Staff_performer::acknowledge_audio_element (Audio_element_info inf)
           else if (Audio_dynamic *d = dynamic_cast<Audio_dynamic *> (inf.elem_))
             {
               dynamic_map_[voice] = d;
-              // Output volume as velocity: must disable Midi_dynamic output
-              d->silent_ = true;
+              // Output volume as velocity: skip Midi_dynamic output for the
+              // current element.
+              return;
             }
         }
-      Audio_staff *audio_staff = get_audio_staff (voice);
       audio_staff->add_audio_item (ai);
     }
 }