X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-walker.cc;h=97a70252b385fb33fd69511088ba18ff78d4513c;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=b99b611c6969155592815a426ad937984d38ad0d;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc index b99b611c69..97a70252b3 100644 --- a/lily/midi-walker.cc +++ b/lily/midi-walker.cc @@ -3,138 +3,193 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys - Jan Nieuwenhuizen - */ + (c) 1997--2008 Han-Wen Nienhuys + Jan Nieuwenhuizen +*/ #include "midi-walker.hh" + #include "audio-column.hh" -#include "audio-item.hh" #include "audio-staff.hh" #include "midi-item.hh" +#include "midi-chunk.hh" #include "midi-stream.hh" -#include "debug.hh" +#include "warn.hh" -Midi_note_event::Midi_note_event() -{ - ignore_b_ = false; +Midi_note_event::Midi_note_event () +{ + ignore_ = false; } int -compare (Midi_note_event const& left, Midi_note_event const& right) +compare (Midi_note_event const &left, Midi_note_event const &right) { - return sign (left.key - right.key); + Moment m = (left.key - right.key); + + if (m < 0) + return -1; + else if (m > 0) + return 1; + else + return 0; } -Midi_walker::Midi_walker (Audio_staff* audio_staff_l, Midi_track* track_l) +bool +audio_item_less (Audio_item * const a, + Audio_item * const b) { - track_l_ = track_l; - index_= 0; - item_l_arr_l_ = &audio_staff_l->audio_item_l_arr_; - last_mom_ = 0; + return a->get_column ()->when_ < b->get_column ()->when_; } -Midi_walker::~Midi_walker() -{ - // ugh - do_stop_notes (last_mom_ + Moment (10, 1)); +Midi_walker::Midi_walker (Audio_staff *audio_staff, Midi_track *track, + int channel) +{ + channel_ = channel; + track_ = track; + index_ = 0; + items_ = audio_staff->audio_items_; + vector_sort (items_, audio_item_less); + last_tick_ = 0; +} + +Midi_walker::~Midi_walker () +{ + junk_pointers (midi_events_); +} + +void +Midi_walker::finalize () +{ + do_stop_notes (INT_MAX); } /** - Find out if start_note event is needed, and do it if needed. - */ -void -Midi_walker::do_start_note (Midi_note* note_p) + Find out if start_note event is needed, and do it if needed. +*/ +void +Midi_walker::do_start_note (Midi_note *note) { - 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++) + Audio_item *ptr = items_[index_]; + assert (note->audio_ == ptr); + int stop_ticks = int (moment_to_real (note->audio_->length_mom_) * Real (384 * 4)) + + ptr->audio_column_->ticks (); + + bool play_start = true; + for (vsize i = 0; i < stop_note_queue.size (); i++) { - if (stop_note_queue[i].val->pitch_i() == note_p->pitch_i ()) + /* if this pith already in queue */ + if (stop_note_queue[i].val->get_semitone_pitch () + == note->get_semitone_pitch ()) { - if (stop_note_queue[i].key < stop_mom) - stop_note_queue[i].ignore_b_ = true; - else { - // skip the stopnote - delete note_p; - return; - } + if (stop_note_queue[i].key < stop_ticks) + { + /* let stopnote in queue be ignored, + new stop note wins */ + stop_note_queue[i].ignore_ = true; + + /* don't replay start note, */ + play_start = false; + break; + } + else + { + /* skip this stopnote, + don't play the start note */ + note = 0; + break; + } } } - Midi_note_event e; - 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); + if (note) + { + Midi_note_event e; + e.val = new Midi_note_off (note); + + midi_events_.push_back (e.val); + e.key = int (stop_ticks); + stop_note_queue.insert (e); + + if (play_start) + output_event (ptr->audio_column_->ticks (), note); + } } -/** - Output note events for all notes which end before #max_mom# - */ void -Midi_walker::do_stop_notes (Moment max_mom) +Midi_walker::do_stop_notes (int max_ticks) { - while (stop_note_queue.size() && stop_note_queue.front ().key <= max_mom) + while (stop_note_queue.size () && stop_note_queue.front ().key <= max_ticks) { - Midi_note_event e = stop_note_queue.get(); - if (e.ignore_b_) + Midi_note_event e = stop_note_queue.get (); + if (e.ignore_) { - delete e.val; continue; } - - Moment stop_mom = e.key; - Midi_note* note_p = e.val; - - output_event (stop_mom, note_p); + + int stop_ticks = e.key; + Midi_note *note = e.val; + + output_event (stop_ticks, note); } } -/** - Advance the track to #now#, output the item, and adjust current "moment". - */ void -Midi_walker::output_event (Moment now_mom, Midi_item* l) +Midi_walker::output_event (int now_ticks, Midi_item *l) { - Moment delta_t = now_mom - last_mom_ ; - last_mom_ += delta_t; - track_l_->add (delta_t, l); + int delta_ticks = now_ticks - last_tick_; + last_tick_ = now_ticks; + + /* + this is not correct, but at least it doesn't crash when you + start with graces + */ + if (delta_ticks < 0) + { + programming_error ("Going back in MIDI time."); + delta_ticks = 0; + } + + track_->add (delta_ticks, l); } void -Midi_walker::process() +Midi_walker::process () { - Audio_item* audio_p = (*item_l_arr_l_)[index_]; - do_stop_notes (audio_p->audio_column_l_->at_mom ()); + Audio_item *audio = items_[index_]; + do_stop_notes (audio->audio_column_->ticks ()); - /* - THIS IS A MEMORY LEAK. FIXME. - */ - //Midi_item* p = ptr->midi_item_p (); - if (Midi_item* midi_p = Midi_item::midi_p (audio_p)) + if (Midi_item *midi = get_midi (audio)) { - midi_p->channel_i_ = track_l_->number_i_; - if (Midi_note* note_p = dynamic_cast(midi_p)) + if (Midi_channel_item *mci = dynamic_cast (midi)) + mci->channel_ = channel_; + + if (Midi_note *note = dynamic_cast (midi)) { - if (note_p->length_mom ()) - do_start_note (note_p); + if (note->audio_->length_mom_.to_bool ()) + do_start_note (note); } else - output_event (audio_p->audio_column_l_->at_mom (), midi_p); + output_event (audio->audio_column_->ticks (), midi); } } +Midi_item* +Midi_walker::get_midi (Audio_item *i) +{ + Midi_item *mi = Midi_item::get_midi (i); + midi_events_.push_back (mi); + return mi; +} + bool Midi_walker::ok () const { - return index_ size (); + return index_ < items_.size (); } void -Midi_walker::operator ++(int) +Midi_walker::operator ++ (int) { - assert (ok()); + assert (ok ()); index_++; }