X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=3a05cbd0e25213673aa5577c55c7eb7d3fe5feaf;hb=f587047ea429f72e18b403e930bcf617557dd621;hp=ec4de3e9f8cabb2c66ac436e09ae22afddc168c0;hpb=f127e14af04f474d20406ca0e0f76f05061ee103;p=lilypond.git

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index ec4de3e9f8..3a05cbd0e2 100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -31,10 +31,6 @@
 
 #include "translator.icc"
 
-using std::deque;
-using std::map;
-using std::string;
-
 /* Perform a staff. Individual notes should have their instrument
   (staff-wide) set, so we override play_element ()
 */
@@ -83,6 +79,12 @@ map<string, int> Staff_performer::static_channel_map_;
 int Staff_performer::channel_count_ = 0;
 int Staff_performer::staff_performer_count_ = 0;
 
+void
+Staff_performer::boot ()
+{
+
+}
+
 ADD_TRANSLATOR (Staff_performer,
                 /* doc */
                 "",
@@ -335,6 +337,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_)
         {
@@ -348,11 +351,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);
     }
 }