diff options
| author | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2006-09-01 02:01:02 +0000 |
|---|---|---|
| committer | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2006-09-01 02:01:02 +0000 |
| commit | 6d37e68b8d93284b8ce8a17975fe3ac482a02f2d (patch) | |
| tree | 691fd133bf8bdc6ef462c78c4a44a3a1fd937cbf /lily/audio-staff.cc | |
| parent | 897b3ba501c80ccf0d1fc4e65c70a9dc979c3e12 (diff) | |
* python/midi.c (midi_parse_track): robustness: don't read past
end of string.
* ly/performer-init.ly: add Control_track_performer, move
Tempo_performer and Time_signature_performer to Score.
* lily/score-performer.cc (acknowledge_audio_elements): override
from base class: add to audio-columns
* lily/control-track-performer.cc (add_text): new file: generate
the control track.
* lily/performance.cc: move output_header_track to Control_track_performer()
* lily/midi-walker.cc (Midi_walker): get channel in constructor.
* lily/include/midi-item.hh (class Midi_channel_item): insert
class into hierarchy, for items that can have a channel setting. Dehungarify.
* lily/include/performer.hh (class Performer): remove
play_element(); move functionality into announce/acknowledge.
* lily/audio-staff.cc (output): remove channel_ from Midi_track.
Diffstat (limited to 'lily/audio-staff.cc')
| -rw-r--r-- | lily/audio-staff.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc index a715cbc1de..5d402febf5 100644 --- a/lily/audio-staff.cc +++ b/lily/audio-staff.cc @@ -19,14 +19,14 @@ Audio_staff::add_audio_item (Audio_item *l) } void -Audio_staff::output (Midi_stream &midi_stream, int track) +Audio_staff::output (Midi_stream &midi_stream, int channel) { Midi_track midi_track; - midi_track.number_ = track; - midi_track.channel_ = channel_; + midi_track.number_ = channel; - for (Midi_walker i (this, &midi_track); i.ok (); i++) + for (Midi_walker i (this, &midi_track, channel); i.ok (); i++) i.process (); + midi_stream << midi_track; } |