X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=6d621a79a3319a1e7526450bcfadf75046ad5f5f;hb=cf3642858a2340bb39ee56739f34c799946d4454;hp=5e124c8bafb0451680254acc43b745b6c72b0c68;hpb=bea1783a6b70e41c45f85136146cdd7fa773fb8e;p=lilypond.git

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 5e124c8baf..6d621a79a3 100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -50,7 +50,7 @@ private:
   int get_channel (string instrument);
   Audio_staff* get_audio_staff (string voice);
   Audio_staff* new_audio_staff (string voice);
-  Real get_dynamic (string voice);
+  Audio_dynamic* get_dynamic (string voice);
 
   string instrument_string_;
   int channel_;
@@ -60,13 +60,19 @@ private:
   Audio_tempo *tempo_;
   map<string, Audio_staff*> staff_map_;
   map<string, int> channel_map_;
-  map<string, Real> dynamic_map_;
+  map<string, Audio_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.
   static map<string, int> static_channel_map_;
   static int channel_count_;
+  // For now, ask the last Staff_performer clean up during its finalize method
+  static int staff_performer_count_;
 };
 
 map<string, int> Staff_performer::static_channel_map_;
 int Staff_performer::channel_count_ = 0;
+int Staff_performer::staff_performer_count_ = 0;
 
 #include "translator.icc"
 
@@ -84,7 +90,7 @@ ADD_TRANSLATOR (Staff_performer,
 		"");
 
 Staff_performer::Staff_performer ()
-  : channel_ (0)
+  : channel_ (-1)
   , instrument_ (0)
   , instrument_name_ (0)
   , name_ (0)
@@ -99,24 +105,38 @@ Staff_performer::~Staff_performer ()
 void
 Staff_performer::initialize ()
 {
+   ++staff_performer_count_;
 }
 
 Audio_staff*
 Staff_performer::new_audio_staff (string voice)
 {
   Audio_staff* audio_staff = new Audio_staff;
-  name_ = new Audio_text (Audio_text::TRACK_NAME, context ()->id_string ()
-			  + ":" + voice);
-  audio_staff->add_audio_item (name_);
+  audio_staff->merge_unisons_
+    = to_boolean (get_property ("midiMergeUnisons"));
+  string track_name = context ()->id_string () + ":" + voice;
+  if (track_name != ":")
+    {
+      name_ = new Audio_text (Audio_text::TRACK_NAME, context ()->id_string ()
+			      + ":" + voice);
+      audio_staff->add_audio_item (name_);
+      announce_element (Audio_element_info (name_, 0));
+    }
   announce_element (Audio_element_info (audio_staff, 0));
-  announce_element (Audio_element_info (name_, 0));
   staff_map_[voice] = audio_staff;
+  if (!instrument_string_.empty ())
+    set_instrument (channel_, voice);
   return audio_staff;
 }
 
 Audio_staff*
 Staff_performer::get_audio_staff (string voice)
 {
+  SCM channel_mapping = get_property ("midiChannelMapping");
+  if (channel_mapping != ly_symbol2scm ("instrument")
+      && staff_map_.size ())
+    return staff_map_.begin ()->second;
+
   map<string, Audio_staff*>::const_iterator i = staff_map_.find (voice);
   if (i != staff_map_.end ())
     return i->second;
@@ -129,10 +149,10 @@ Staff_performer::get_audio_staff (string voice)
   return new_audio_staff (voice);
 }
 
-Real
+Audio_dynamic*
 Staff_performer::get_dynamic (string voice)
 {
-  map<string, Real>::const_iterator i = dynamic_map_.find (voice);
+  map<string, Audio_dynamic*>::const_iterator i = dynamic_map_.find (voice);
   if (i != dynamic_map_.end ())
     return i->second;
   return 0;
@@ -179,8 +199,13 @@ Staff_performer::finalize ()
 {
   staff_map_.clear ();
   channel_map_.clear ();
-  channel_count_ = 0;
-  static_channel_map_.clear ();
+  if (staff_performer_count_)
+    --staff_performer_count_;
+  if (0 == staff_performer_count_)
+    {
+      static_channel_map_.clear ();
+      channel_count_ = 0;
+    }
 }
 
 string
@@ -201,23 +226,31 @@ Staff_performer::new_instrument_string ()
 int
 Staff_performer::get_channel (string instrument)
 {
-  SCM channel_per_staff = get_property ("midiChannelPerStaff");
-  map<string, int>& channel_map = (channel_per_staff == SCM_BOOL_T)
+  SCM channel_mapping = get_property ("midiChannelMapping");
+  map<string, int>& channel_map
+    = (channel_mapping != ly_symbol2scm ("instrument"))
     ? channel_map_
     : static_channel_map_;
 
+  if (channel_mapping == ly_symbol2scm ("staff")
+      && channel_ >= 0)
+    return channel_;
+
   map<string, int>::const_iterator i = channel_map.find (instrument);
   if (i != channel_map.end ())
     return i->second;
  
-  int channel = (channel_per_staff == SCM_BOOL_T)
+  int channel = (channel_mapping == ly_symbol2scm ("staff"))
     ? channel_count_++
-    :channel_map.size ();
+    : channel_map.size ();
 
   /* MIDI players tend to ignore instrument settings on channel
      10, the percussion channel.  */
   if (channel % 16 == 9)
-    channel_map["percussion"] = channel++;
+    {
+      channel_map["percussion"] = channel++;
+      channel_count_++;
+    }
 
   if (channel > 15)
     {
@@ -240,20 +273,34 @@ Staff_performer::acknowledge_audio_element (Audio_element_info inf)
       string voice;
       if (c->is_alias (ly_symbol2scm ("Voice")))
 	voice = c->id_string ();
+      SCM channel_mapping = get_property ("midiChannelMapping");
       string str = new_instrument_string ();
+      if (channel_mapping != ly_symbol2scm ("instrument"))
+	channel_ = get_channel (voice);
+      else if (channel_ < 0 && str.empty ())
+	channel_ = get_channel (str);
       if (str.length ())
 	{
-	  channel_ = get_channel (str);
+	  if (channel_mapping != ly_symbol2scm ("voice"))
+	    channel_ = get_channel (str);
 	  set_instrument (channel_, voice);
 	  set_instrument_name (voice);
 	}
-      Audio_staff* audio_staff = get_audio_staff (voice);
       ai->channel_ = channel_;
-      if (Audio_dynamic *d = dynamic_cast<Audio_dynamic *> (inf.elem_))
-	dynamic_map_[voice] = d->volume_;
-      if (Real d = get_dynamic (voice))
-	if (Audio_note *n = dynamic_cast<Audio_note *> (inf.elem_))
-	  n->volume_ = d;
+      bool encode_dynamics_as_velocity_ = true;
+      if (encode_dynamics_as_velocity_)
+	{
+	  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;
+	    }
+	  if (Audio_dynamic *d = get_dynamic (voice))
+	    if (Audio_note *n = dynamic_cast<Audio_note *> (inf.elem_))
+	      n->dynamic_ = d;
+	}
+      Audio_staff* audio_staff = get_audio_staff (voice);
       audio_staff->add_audio_item (ai);
     }
 }