X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-walker.cc;h=340eee849285c3b98defa46e353a575cae37670b;hb=36a2ef8fd1db451ea9318743561856b4f0907ba2;hp=4a1674c7f7a043feb802f2e9058b679997bb8865;hpb=4bdf5f822b18b10b48f619c116641e6aee1968ac;p=lilypond.git diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc index 4a1674c7f7..340eee8492 100644 --- a/lily/midi-walker.cc +++ b/lily/midi-walker.cc @@ -1,95 +1,173 @@ /* midi-walker.cc -- implement Midi_walker - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys , Jan Nieuwenhuizen -*/ + (c) 1997--2004 Han-Wen Nienhuys + Jan Nieuwenhuizen + */ -#include "musicalrequest.hh" -#include "pscore.hh" -#include "staff.hh" #include "midi-walker.hh" +#include "audio-column.hh" +#include "audio-item.hh" +#include "audio-staff.hh" #include "midi-item.hh" #include "midi-stream.hh" -#include "debug.hh" -#include "staff-column.hh" +#include "warn.hh" + +Midi_note_event::Midi_note_event () +{ + ignore_b_ = false; +} -Midi_walker::Midi_walker(Staff *st_l, Midi_track* track_l) - : PCursor(st_l->cols_) +int +compare (Midi_note_event const& left, Midi_note_event const& right) { - track_l_ = track_l; - last_moment_= 0; + 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, Midi_track* track) +{ + track_ = track; + index_= 0; + items_ = &audio_staff->audio_items_; + + last_mom_ = 0; +} + +Midi_walker::~Midi_walker () +{ + // ugh + do_stop_notes (last_mom_ + Moment (Rational (10, 1))); } /** - output notestop events for all notes which end before #max_moment# + Find out if start_note event is needed, and do it if needed. */ -void -Midi_walker::do_stop_notes(Moment max_moment) +void +Midi_walker::do_start_note (Midi_note* note) { - while (stop_notes.size() && stop_notes.front_idx() <= max_moment) { - Moment stop_moment = stop_notes.front_idx(); - Melodic_req * req_l = stop_notes.get(); - - Midi_note note(req_l, track_l_->number_i_, false); - output_event(note, stop_moment); + Audio_item* ptr = (*items_)[index_]; + Moment stop_mom = note->get_length () + ptr->audio_column_->at_mom (); + + bool play_start = true; + for (int i=0; i < stop_note_queue.size (); i++) + { + /* if this pith already in queue */ + if (stop_note_queue[i].val->get_pitch () == note->get_pitch ()) + { + if (stop_note_queue[i].key < stop_mom) + { + /* let stopnote in queue be ignored, + new stop note wins */ + stop_note_queue[i].ignore_b_ = true; + /* don't replay start note, */ + play_start = false; + break; + } + else + { + /* skip this stopnote, + don't play the start note */ + delete note; + note = 0; + break; + } + } + } + + if (note) + { + Midi_note_event e; + e.val = new Midi_note_off (note); + e.key = stop_mom; + stop_note_queue.insert (e); + + if (play_start) + output_event (ptr->audio_column_->at_mom (), note); } } + /** - Find out if start_note event is needed, and do it if needed. + Output note events for all notes which end before #max_mom# */ -void -Midi_walker::do_start_note(Note_req*note_l) +void +Midi_walker::do_stop_notes (Moment max_mom) { - Moment stop=note_l->duration() + ptr()->when(); - for(int i=0; i < stop_notes.size(); i++) - if (stop_notes.value_arr_[i]->melodic()->pitch() == - note_l->pitch()) { - if ( stop_notes.indices_arr_[i] < stop){ - - stop_notes.del(i); - return ; // removing this gives a feature ( ${c2 c4}$ output correctly) - } - else - return; // skip the stop note - break;// do the stop note + while (stop_note_queue.size () && stop_note_queue.front ().key <= max_mom) + { + Midi_note_event e = stop_note_queue.get (); + if (e.ignore_b_) + { + delete e.val; + continue; } - - stop_notes.enter(note_l, stop); - Midi_note note(note_l, track_l_->number_i_, true); - output_event(note, ptr()->when()); + + Moment stop_mom = e.key; + Midi_note* note = e.val; + + output_event (stop_mom, note); + } } - -/** advance the track to #now#, output the item, and adjust current - "moment". */ +/** + Advance the track to #now#, output the item, and adjust current "moment". + */ void -Midi_walker::output_event(Midi_item &i, Moment now) +Midi_walker::output_event (Moment now_mom, Midi_item* l) { - Moment delta_t = now - last_moment_ ; - last_moment_ += delta_t; - track_l_->add(delta_t, &i ); + Moment delta_t = now_mom - last_mom_ ; + last_mom_ = now_mom; + + /* + this is not correct, but at least it doesn't crash when you + start with graces + */ + if (delta_t < Moment (0)) + { + delta_t = Moment (0); + } + + + track_->add (delta_t, l); } void -Midi_walker::process_requests() +Midi_walker::process () { - do_stop_notes(ptr()->when()); - for ( int i = 0; i < ptr()->musicalreq_l_arr_.size(); i++ ) { - - Rhythmic_req *n = ptr()->musicalreq_l_arr_[i]->rhythmic(); - if ( !n) - continue; - Note_req * note_l = n->note(); - if (!note_l) - continue; - do_start_note(note_l); - + Audio_item* audio = (*items_)[index_]; + do_stop_notes (audio->audio_column_->at_mom ()); + + if (Midi_item* midi = Midi_item::get_midi (audio)) + { + midi->channel_ = track_->channel_; + //midi->channel_ = track_->number_; + if (Midi_note* note = dynamic_cast (midi)) + { + if (note->get_length ().to_bool ()) + do_start_note (note); + } + else + output_event (audio->audio_column_->at_mom (), midi); } } -Midi_walker::~Midi_walker() +bool +Midi_walker::ok () const +{ + return index_ size (); +} + +void +Midi_walker::operator ++ (int) { - do_stop_notes( last_moment_ + Moment(10,1)); // ugh + assert (ok ()); + index_++; }