source file of the GNU LilyPond music typesetter
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
}
Midi_walker::Midi_walker (Audio_staff* audio_staff_l, Midi_track* track_l)
- : PCursor<Audio_item*>(audio_staff_l->audio_item_l_list_)
{
track_l_ = track_l;
+ index_= 0;
+ item_l_arr_l_ = &audio_staff_l->audio_item_l_arr_;
last_mom_ = 0;
}
void
Midi_walker::do_start_note (Midi_note* note_p)
{
- Moment stop_mom = note_p->length_mom () + ptr ()->audio_column_l_->at_mom ();
+ Audio_item* ptr = (*item_l_arr_l_)[index_];
+ Moment stop_mom = note_p->length_mom () + ptr->audio_column_l_->at_mom ();
for (int i=0; i < stop_note_queue.size(); i++)
{
if (stop_note_queue[i].val->pitch_i() == note_p->pitch_i ())
e.val = new Midi_note_off (note_p);
e.key = stop_mom;
stop_note_queue.insert (e);
-
- output_event (ptr()->audio_column_l_->at_mom (), note_p);
+
+ output_event (ptr->audio_column_l_->at_mom (), note_p);
}
/**
}
Moment stop_mom = e.key;
- Midi_note_off* note_p = e.val;
+ Midi_note* note_p = e.val;
output_event (stop_mom, note_p);
}
void
Midi_walker::process()
{
- do_stop_notes (ptr()->audio_column_l_->at_mom ());
+ Audio_item* audio_p = (*item_l_arr_l_)[index_];
+ do_stop_notes (audio_p->audio_column_l_->at_mom ());
- Midi_item* p = ptr()->midi_item_p ();
- if (!p)
- return;
- p->channel_i_ = track_l_->number_i_;
-
- if (Midi_note *mi = dynamic_cast<Midi_note*>(p))
- do_start_note (mi);
- else
- output_event (ptr()->audio_column_l_->at_mom (), p);
+ /*
+ THIS IS A MEMORY LEAK. FIXME.
+ */
+ //Midi_item* p = ptr->midi_item_p ();
+ if (Midi_item* midi_p = Midi_item::midi_p (audio_p))
+ {
+ midi_p->channel_i_ = track_l_->number_i_;
+ if (Midi_note* note_p = dynamic_cast<Midi_note*>(midi_p))
+ {
+ if (note_p->length_mom ())
+ do_start_note (note_p);
+ }
+ else
+ output_event (audio_p->audio_column_l_->at_mom (), midi_p);
+ }
}
+bool
+Midi_walker::ok () const
+{
+ return index_ <item_l_arr_l_->size ();
+}
+
+void
+Midi_walker::operator ++(int)
+{
+ assert (ok());
+ index_++;
+}