X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-walker.cc;h=3bdc426be042bb8d83c3423924d79a125f82c289;hb=49ec27a164a91714ebf51989652520ec3f62b973;hp=3068c987ddbdb0c458f5b1e8adf0c7bd0d4587bc;hpb=036af34aa44a151b9e67c18e0acccaafdfae9de8;p=lilypond.git diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc index 3068c987dd..3bdc426be0 100644 --- a/lily/midi-walker.cc +++ b/lily/midi-walker.cc @@ -3,129 +3,173 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys , Jan Nieuwenhuizen - - TODO - - Ideally this should also use a register system, to process slurs, - dynamics, etc. - + (c) 1997--2007 Han-Wen Nienhuys + Jan Nieuwenhuizen */ -#include "command-request.hh" -#include "musical-request.hh" -#include "p-score.hh" #include "midi-walker.hh" + +#include "audio-column.hh" +#include "audio-staff.hh" #include "midi-item.hh" #include "midi-stream.hh" -#include "debug.hh" -#if 0 -Midi_walker::Midi_walker(Staff *st_l, Midi_track* track_l) - : PCursor(st_l->cols_) +#include "warn.hh" + +Midi_note_event::Midi_note_event () +{ + ignore_b_ = false; +} + +int +compare (Midi_note_event const &left, Midi_note_event const &right) +{ + 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, + int channel) +{ + channel_ = channel; + track_ = track; + index_ = 0; + items_ = &audio_staff->audio_items_; + + last_mom_ = 0; +} + +Midi_walker::~Midi_walker () { - track_l_ = track_l; - last_moment_= 0; + // 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) +Midi_walker::do_start_note (Midi_note *note) { - while (stop_notes.size() && stop_notes.front().key <= max_moment) { - Note_event ent=stop_notes.get(); - if (ent.ignore_b_) - continue; - - Moment stop_moment = ent.key; - Melodic_req * req_l = ent.val; - - 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_->when (); + + bool play_start = true; + for (vsize i = 0; i < stop_note_queue.size (); 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) + { + /* 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_->when (), note); } } + /** - Find out if start_note event is needed, and do it if needed. - */ -void -Midi_walker::do_start_note(Note_req*note_l) + Output note events for all notes which end before #max_mom# +*/ +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[i].val->melodic()->pitch() == - note_l->pitch()) { - if ( stop_notes[i].key < stop){ - stop_notes[i].ignore_b_=true; - } - else - return; // skip 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; } + + Moment stop_mom = e.key; + Midi_note *note = e.val; + + output_event (stop_mom, note); } - Note_event e; - e.val = note_l; - e.key = stop; - - stop_notes.insert(e); - - Midi_note note(note_l, track_l_->number_i_, true); - output_event(note, ptr()->when()); } - -/** 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::do_process_requests() +Midi_walker::process () { - do_stop_notes(ptr()->when()); - - for ( int i = 0; i < ptr()->commandreq_l_arr_.size(); i++ ) { - Command_req *c_l = ptr()->commandreq_l_arr_[i]->command(); - Meter_change_req* meter_l = c_l->meterchange(); - if ( meter_l ) - output_event( Midi_time( meter_l->beats_i_, meter_l->one_beat_i_, 18 ), ptr()->when() ); - Key_change_req* key_l = c_l->keychange(); - if ( key_l ) { - int sharps_i = key_l->sharps_i(); - int flats_i = key_l->flats_i(); - // midi cannot handle non-conventional keys - if ( !( flats_i && sharps_i ) ) - output_event( Midi_key( sharps_i - flats_i, key_l->minor_b() ), ptr()->when() ); - } - } + Audio_item *audio = (*items_)[index_]; + do_stop_notes (audio->audio_column_->when ()); - for ( int i = 0; i < ptr()->musicalreq_l_arr_.size(); i++ ) { - Musical_req *m = ptr()->musicalreq_l_arr_[i]->musical(); - if (!m) - return; - Rhythmic_req *n = m->rhythmic(); - if ( !n) - continue; - Note_req * note_l = n->note(); - if (!note_l) - continue; - do_start_note(note_l); + if (Midi_item *midi = Midi_item::get_midi (audio)) + { + if (Midi_channel_item *mci = dynamic_cast (midi)) + mci->channel_ = 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_->when (), midi); } } -Midi_walker::~Midi_walker() +bool +Midi_walker::ok () const { - do_stop_notes( last_moment_ + Moment(10,1)); // ugh + return index_ < items_->size (); } - -int -compare(Note_event const&e1, Note_event const&e2) +void +Midi_walker::operator ++ (int) { - return sign(e1.key - e2.key); + assert (ok ()); + index_++; } -#endif