X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=baffba04329679bf08e085d1f0ff0b336dac01f6;hb=84bdcba4e72ed9161fa6091441a41a02d81069aa;hp=61014a0d160d6b21ac3f9779c4a1c2bf3a0eea69;hpb=a4d7106c75b325441063fd9ba9c4131979784aa5;p=lilypond.git

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 61014a0d16..1f34290aac 100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -1,28 +1,95 @@
 /*
-  staff-performer.cc -- implement Staff_performer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <map>
 
-#include "staff-performer.hh"
-#include "translator-group.hh"
-#include "debug.hh"
 #include "audio-column.hh"
 #include "audio-item.hh"
 #include "audio-staff.hh"
+#include "context.hh"
+#include "international.hh"
+#include "performer-group.hh"
+#include "warn.hh"
+
+/* Perform a staff. Individual notes should have their instrument
+  (staff-wide) set, so we override play_element ()
+*/
+class Staff_performer : public Performer
+{
+public:
+  TRANSLATOR_DECLARATIONS (Staff_performer);
+  ~Staff_performer ();
+
+protected:
+  virtual void acknowledge_audio_element (Audio_element_info info);
+  virtual void finalize ();
+  virtual void initialize ();
+  void process_music ();
+  void stop_translation_timestep ();
+
+private:
+  string new_instrument_string ();
+  void set_instrument_name (string voice);
+  void set_instrument (int channel, string voice);
+  int get_channel (string instrument);
+  Audio_staff* get_audio_staff (string voice);
+  Audio_staff* new_audio_staff (string voice);
+  Real get_dynamic (string voice);
 
+  string instrument_string_;
+  int channel_;
+  Audio_instrument *instrument_;
+  Audio_text *instrument_name_;
+  Audio_text *name_;
+  Audio_tempo *tempo_;
+  map<string, Audio_staff*> staff_map_;
+  map<string, int> channel_map_;
+  map<string, Real> dynamic_map_;
+  static map<string, int> static_channel_map_;
+  static int channel_count_;
+};
 
-ADD_THIS_TRANSLATOR (Staff_performer);
+map<string, int> Staff_performer::static_channel_map_;
+int Staff_performer::channel_count_ = 0;
+
+#include "translator.icc"
+
+ADD_TRANSLATOR (Staff_performer,
+		/* doc */
+		"",
+
+		/* create */
+		"",
+
+		/* read */
+		"",
+
+		/* write */
+		"");
 
 Staff_performer::Staff_performer ()
+  : channel_ (0)
+  , instrument_ (0)
+  , instrument_name_ (0)
+  , name_ (0)
+  , tempo_ (0)
 {
-  audio_staff_p_ = 0;
-  instrument_p_ = 0;
-  instrument_name_p_ = 0;
-  name_p_ = 0;
-  tempo_p_ = 0;
 }
 
 Staff_performer::~Staff_performer ()
@@ -30,93 +97,185 @@ Staff_performer::~Staff_performer ()
 }
 
 void
-Staff_performer::do_creation_processing ()
+Staff_performer::initialize ()
+{
+}
+
+Audio_staff*
+Staff_performer::new_audio_staff (string voice)
 {
-  audio_staff_p_ = new Audio_staff;
-  announce_element (Audio_element_info (audio_staff_p_, 0));
+  Audio_staff* audio_staff = new Audio_staff;
+  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));
+  staff_map_[voice] = audio_staff;
+  if (!instrument_string_.empty ())
+    set_instrument (channel_, voice);
+  return audio_staff;
+}
 
-  name_p_ = new Audio_text (Audio_text::TRACK_NAME, id_str_);
-  announce_element (Audio_element_info (name_p_, 0));
+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;
 
-  tempo_p_ = new Audio_tempo (get_tempo_i ());
-  announce_element (Audio_element_info (tempo_p_, 0));
+  map<string, Audio_staff*>::const_iterator i = staff_map_.find (voice);
+  if (i != staff_map_.end ())
+    return i->second;
+  map<string, Audio_staff*>::const_iterator e = staff_map_.find ("");
+  if (staff_map_.size () == 1 && e != staff_map_.end ())
+    {
+      staff_map_[voice] = e->second;
+      return e->second;
+    }
+  return new_audio_staff (voice);
+}
 
-  Performer_group_performer::do_creation_processing ();
+Real
+Staff_performer::get_dynamic (string voice)
+{
+  map<string, Real>::const_iterator i = dynamic_map_.find (voice);
+  if (i != dynamic_map_.end ())
+    return i->second;
+  return 0;
 }
 
 void
-Staff_performer::deprecated_process_music ()
+Staff_performer::process_music ()
 {
-  String str = new_instrument_str ();
-  if (str.length_i ())
-    {
-      instrument_name_p_ = new Audio_text (Audio_text::INSTRUMENT_NAME, str);
-      announce_element (Audio_element_info (instrument_name_p_, 0));
-      instrument_p_ = new Audio_instrument (str);
-      announce_element (Audio_element_info (instrument_p_, 0));
-    }
-  Performer_group_performer::deprecated_process_music ();
 }
 
 void
-Staff_performer::do_pre_move_processing ()
+Staff_performer::set_instrument (int channel, string voice)
 {
-  if (name_p_)
-    {
-      play_element (name_p_);
-      name_p_ = 0;
-    }
-  if (tempo_p_)
-    {
-      play_element (tempo_p_);
-      tempo_p_ = 0;
-    }
-  if (instrument_name_p_)
-    {
-      play_element (instrument_name_p_);
-      instrument_name_p_ = 0;
-    }
-  if (instrument_p_)
-    {
-      play_element (instrument_p_);
-      instrument_p_ = 0;
-    }
-  Performer_group_performer::do_pre_move_processing ();
+  instrument_ = new Audio_instrument (instrument_string_);
+  instrument_->channel_ = channel;
+  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 ()));
+  audio_staff->percussion_ = (drums == SCM_BOOL_T);
 }
 
 void
-Staff_performer::do_removal_processing ()
+Staff_performer::set_instrument_name (string voice)
 {
-  Performer_group_performer::do_removal_processing ();
-  Performer::play_element (audio_staff_p_);
-  audio_staff_p_ = 0;
+  instrument_name_ = new Audio_text (Audio_text::INSTRUMENT_NAME,
+				     instrument_string_);
+  announce_element (Audio_element_info (instrument_name_, 0));
+  get_audio_staff (voice)->add_audio_item (instrument_name_);
 }
 
-String 
-Staff_performer::new_instrument_str () 
-{ 
-  // mustn't ask Score for instrument: it will return piano!
-  SCM minstr = get_property (ly_symbol2scm ("midiInstrument"));
+void
+Staff_performer::stop_translation_timestep ()
+{
+  name_ = 0;
+  tempo_ = 0;
+  instrument_name_ = 0;
+  instrument_ = 0;
+}
 
-  if (!gh_string_p(minstr))
-    minstr = get_property (ly_symbol2scm ("instrument"));
+void
+Staff_performer::finalize ()
+{
+  staff_map_.clear ();
+  channel_map_.clear ();
+}
 
-  if (!gh_string_p (minstr)
-      || ly_scm2string (minstr) == instrument_str_)
+string
+Staff_performer::new_instrument_string ()
+{
+  // mustn't ask Score for instrument: it will return piano!
+  SCM minstr = get_property ("midiInstrument");
+
+  if (!scm_is_string (minstr)
+      || ly_scm2string (minstr) == instrument_string_)
     return "";
 
-  instrument_str_ = ly_scm2string (minstr);
+  instrument_string_ = ly_scm2string (minstr);
 
-  return instrument_str_;
+  return instrument_string_;
 }
 
-void 
-Staff_performer::play_element (Audio_element* p)
+int
+Staff_performer::get_channel (string instrument)
+{
+  SCM channel_mapping = get_property ("midiChannelMapping");
+  map<string, int>& channel_map
+    = (channel_mapping != ly_symbol2scm ("instrument"))
+    ? channel_map_
+    : static_channel_map_;
+
+  map<string, int>::const_iterator i = channel_map.find (instrument);
+  if (i != channel_map.end ())
+    return i->second;
+ 
+  int channel = (channel_mapping == ly_symbol2scm ("staff"))
+    ? channel_count_++
+    : 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_count_++;
+    }
+
+  if (channel > 15)
+    {
+      warning (_ ("MIDI channel wrapped around"));
+      warning (_ ("remapping modulo 16"));
+      channel = channel % 16; 
+    }
+
+  channel_map[instrument] = channel;
+  return channel;
+}
+
+void
+Staff_performer::acknowledge_audio_element (Audio_element_info inf)
 {
-  if (Audio_item *ai = dynamic_cast<Audio_item *> (p)) 
+  if (Audio_item *ai = dynamic_cast<Audio_item *> (inf.elem_))
     {
-      audio_staff_p_->add_audio_item (ai);
+      /* map each context (voice) to its own track */
+      Context* c = inf.origin_contexts (this)[0];
+      string voice;
+      if (c->is_alias (ly_symbol2scm ("Voice")))
+	voice = c->id_string ();
+      SCM channel_mapping = get_property ("midiChannelMapping");
+      if (channel_mapping == ly_symbol2scm ("voice"))
+	channel_ = get_channel (voice);
+      string str = new_instrument_string ();
+      if (str.length ())
+	{
+	  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_;
+      // Output volume as velocity and disable Midi_dynamic output
+      if (Audio_dynamic *d = dynamic_cast<Audio_dynamic *> (inf.elem_))
+	{
+	  dynamic_map_[voice] = d->volume_;
+	  d->volume_ = -1;
+	}
+      if (Real d = get_dynamic (voice))
+	if (Audio_note *n = dynamic_cast<Audio_note *> (inf.elem_))
+	  n->volume_ = d;
+      audio_staff->add_audio_item (ai);
     }
-  Performer::play_element (p);
 }