*/
#include <time.h>
-#include "warn.hh"
-#include "string.hh"
-#include "string-convert.hh"
-#include "main.hh"
-#include "midi-def.hh"
-#include "midi-item.hh"
-#include "midi-stream.hh"
+
#include "audio-column.hh"
#include "audio-item.hh"
#include "audio-staff.hh"
+#include "file-name.hh"
+#include "lily-version.hh"
+#include "main.hh"
+#include "midi-item.hh"
+#include "midi-stream.hh"
#include "performance.hh"
#include "score.hh"
-#include "input-file-results.hh"
-#include "file-path.hh"
-#include "lily-version.hh"
+#include "string-convert.hh"
+#include "string.hh"
+#include "warn.hh"
#include "killing-cons.tcc"
MIDI players tend to ignore instrument settings on
channel 10, the percussion channel by default.
*/
- if (channel == 9)
+ if (channel % 16 == 9)
channel++;
+
+
+ /*
+ Huh? Why does each staff also have a separate channel? We
+ should map channels to voices, not staves. --hwn.
+ */
if (s->channel_ < 0)
- s->channel_ = channel;
+ {
+ s->channel_ = channel % 16;
+ if (channel > 15)
+ warning ("MIDI channel wrapped around. Remapping modulo 16.");
+ }
+
s->output (midi_stream, channel++);
if (verbose_global_b)
progress_indication ("]");
{
audio_staffs_.push (s);
}
- else if (Audio_column *c = dynamic_cast<Audio_column*> (p))
- {
- c->performance_ = this;
- }
audio_elem_p_list_ = new Killing_cons<Audio_element> (p, audio_elem_p_list_);
}
out = "lelie.midi";
/* Maybe a bit crude, but we had this before */
- Path p = split_path (out);
- p.ext = "midi";
- out = p.to_string ();
+ File_name file_name (out);
+ file_name.ext_ = "midi";
+ out = file_name.to_string ();
Midi_stream midi_stream (out);
progress_indication (_f ("MIDI output to `%s'...", out));
- global_input_file->target_strings_.push (out);
-
output (midi_stream);
progress_indication ("\n");
return SCM_UNDEFINED;