X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=592c6a7e016f4fd82e6be3d998318625dfb4fd42;hb=28d3a736534f3aa3cd403485770a019bd35114c4;hp=505da3adbac4270207edaf15a4cfeb6dfecdff28;hpb=14f464d957b6a68710f0364fc7507b63eb0fcee6;p=lilypond.git

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 505da3adba..592c6a7e01 100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -25,6 +25,7 @@
 #include "audio-staff.hh"
 #include "context.hh"
 #include "international.hh"
+#include "midi-cc-announcer.hh"
 #include "performer-group.hh"
 #include "warn.hh"
 #include "lily-imports.hh"
@@ -54,7 +55,22 @@ private:
   int get_channel (const string &instrument);
   Audio_staff *get_audio_staff (const string &voice);
   Audio_staff *new_audio_staff (const string &voice);
-  Audio_span_dynamic *get_dynamic (const string &voice);
+
+  class Midi_control_initializer : public Midi_control_change_announcer
+  {
+  public:
+    Midi_control_initializer (Staff_performer *performer,
+                              Audio_staff *audio_staff,
+                              int channel);
+
+    SCM get_property_value (const char *property_name);
+    void do_announce (Audio_control_change *item);
+
+  private:
+    Staff_performer *performer_;
+    Audio_staff *audio_staff_;
+    int channel_;
+  };
 
   string instrument_string_;
   int channel_;
@@ -62,10 +78,8 @@ private:
   Audio_text *instrument_name_;
   Audio_text *name_;
   Audio_tempo *tempo_;
-  map<string, deque<Audio_note *> > note_map_;
   map<string, Audio_staff *> staff_map_;
   map<string, int> channel_map_;
-  map<string, Audio_span_dynamic *> dynamic_map_;
   // Would prefer to have the following two items be
   // members of the containing class Performance,
   // so they can be reset for each new midi file output.
@@ -135,32 +149,9 @@ Staff_performer::new_audio_staff (const string &voice)
   staff_map_[voice] = audio_staff;
   if (!instrument_string_.empty ())
     set_instrument (channel_, voice);
-  // Set initial values (if any) for control functions.
-  for (const Audio_control_function_value_change::Context_property *p
-         = Audio_control_function_value_change::context_properties_;
-       p->name_; ++p)
-    {
-      SCM value = get_property (p->name_);
-      if (scm_is_number (value))
-        {
-          Real val = scm_to_double (value);
-          if (val >= p->range_min_ && val <= p->range_max_)
-            {
-              // Normalize the value to the 0.0 to 1.0 range.
-              val = ((val - p->range_min_)
-                     / (p->range_max_ - p->range_min_));
-              Audio_control_function_value_change *item
-                = new Audio_control_function_value_change (p->control_, val);
-              item->channel_ = channel_;
-              audio_staff->add_audio_item (item);
-              announce_element (Audio_element_info (item, 0));
-            }
-          else
-            warning (_f ("ignoring out-of-range value change for MIDI "
-                         "property `%s'",
-                         p->name_));
-        }
-    }
+  // Set initial values (if any) for MIDI controls.
+  Midi_control_initializer i (this, audio_staff, channel_);
+  i.announce_control_changes ();
   return audio_staff;
 }
 
@@ -184,15 +175,6 @@ Staff_performer::get_audio_staff (const string &voice)
   return new_audio_staff (voice);
 }
 
-Audio_span_dynamic *
-Staff_performer::get_dynamic (const string &voice)
-{
-  map<string, Audio_span_dynamic *>::const_iterator i = dynamic_map_.find (voice);
-  if (i != dynamic_map_.end ())
-    return i->second;
-  return 0;
-}
-
 void
 Staff_performer::process_music ()
 {
@@ -226,21 +208,6 @@ Staff_performer::stop_translation_timestep ()
   tempo_ = 0;
   instrument_name_ = 0;
   instrument_ = 0;
-  // For each voice with a note played in the current translation time step,
-  // check if the voice has a dynamic registered: if yes, apply the dynamic
-  // to every note played in the voice in the current translation time step.
-  for (map<string, deque<Audio_note *> >::iterator vi = note_map_.begin ();
-       vi != note_map_.end (); ++vi)
-    {
-      Audio_span_dynamic *d = get_dynamic (vi->first);
-      if (d)
-        {
-          for (deque<Audio_note *>::iterator ni = vi->second.begin ();
-               ni != vi->second.end (); ++ni)
-            (*ni)->dynamic_ = d;
-        }
-    }
-  note_map_.clear ();
 }
 
 void
@@ -337,18 +304,28 @@ Staff_performer::acknowledge_audio_element (Audio_element_info inf)
   if (Audio_item *ai = dynamic_cast<Audio_item *> (inf.elem_))
     {
       ai->channel_ = channel_;
-      if (Audio_note *n = dynamic_cast<Audio_note *> (inf.elem_))
-        {
-          // Keep track of the notes played in the current voice in this
-          // translation time step (for adjusting their dynamics later in
-          // stop_translation_timestep).
-          note_map_[voice].push_back (n);
-        }
       audio_staff->add_audio_item (ai);
     }
-  else if (Audio_span_dynamic *d = dynamic_cast<Audio_span_dynamic *> (inf.elem_))
-    {
-      dynamic_map_[voice] = d;
-    }
 }
 
+Staff_performer::Midi_control_initializer::Midi_control_initializer
+(Staff_performer *performer, Audio_staff *audio_staff, int channel)
+  : performer_ (performer),
+    audio_staff_ (audio_staff),
+    channel_ (channel)
+{
+}
+
+SCM Staff_performer::Midi_control_initializer::get_property_value
+(const char *property_name)
+{
+  return performer_->get_property (property_name);
+}
+
+void Staff_performer::Midi_control_initializer::do_announce
+(Audio_control_change *item)
+{
+  item->channel_ = channel_;
+  audio_staff_->add_audio_item (item);
+  performer_->announce_element (Audio_element_info (item, 0));
+}