/*
- 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--2009 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 "warn.hh"
#include "audio-column.hh"
#include "audio-item.hh"
Audio_text *instrument_name_;
Audio_text *name_;
Audio_tempo *tempo_;
+ map<string, int> channel_map_;
};
#include "translator.icc"
Staff_performer::stop_translation_timestep ()
{
SCM proc = ly_lily_module_constant ("percussion?");
-
SCM drums = scm_call_1 (proc, ly_symbol2scm (instrument_string_.c_str ()));
- audio_staff_->channel_ = (drums == SCM_BOOL_T ? 9 : -1);
+ audio_staff_->percussion_ = (drums == SCM_BOOL_T);
+
if (name_)
- {
name_ = 0;
- }
if (tempo_)
- {
tempo_ = 0;
- }
instrument_name_ = 0;
instrument_ = 0;
}
Staff_performer::acknowledge_audio_element (Audio_element_info inf)
{
if (Audio_item *ai = dynamic_cast<Audio_item *> (inf.elem_))
- audio_staff_->add_audio_item (ai);
+ {
+ /* map each context (voice) to its own channel */
+ Context *c = inf.origin_contexts (this)[0];
+ string id = c->id_string ();
+ int channel = channel_map_.size ();
+ /* MIDI players tend to ignore instrument settings on channel
+ 10, the percussion channel. */
+ if (channel % 16 == 9)
+ channel_map_[""] = channel++;
+
+ map<string, int>::const_iterator i = channel_map_.find (id);
+ if (i != channel_map_.end ())
+ channel = i->second;
+ else
+ channel_map_[id] = channel;
+
+ audio_staff_->add_audio_item (ai);
+ }
}