X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fmidi-walker.cc;h=3bdc426be042bb8d83c3423924d79a125f82c289;hb=49ec27a164a91714ebf51989652520ec3f62b973;hp=4b4eed261ddacd136013915f1467a480e7222247;hpb=6a62932652940f4ac2931f75d48796887fbc5fdc;p=lilypond.git diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc index 4b4eed261d..3bdc426be0 100644 --- a/lily/midi-walker.cc +++ b/lily/midi-walker.cc @@ -3,108 +3,173 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys - Jan Nieuwenhuizen - */ + (c) 1997--2007 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-stream.hh" -#include "debug.hh" +#include "warn.hh" -Midi_note_event::Midi_note_event() -{ - ignore_b_ = false; +Midi_note_event::Midi_note_event () +{ + ignore_b_ = 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 ) - : PCursor( audio_staff_l->audio_item_l_list_ ) +Midi_walker::Midi_walker (Audio_staff *audio_staff, Midi_track *track, + int channel) { - track_l_ = track_l; - last_mom_ = 0; + channel_ = channel; + track_ = track; + index_ = 0; + items_ = &audio_staff->audio_items_; + + last_mom_ = 0; } -Midi_walker::~Midi_walker() -{ - // ugh - do_stop_notes( last_mom_ + Moment( 10, 1 ) ); +Midi_walker::~Midi_walker () +{ + // ugh + do_stop_notes (last_mom_ + Moment (Rational (10, 1))); } /** - Find out if start_note event is needed, and do it if needed. - */ -void -Midi_walker::do_start_note( Midi_note* note_l ) + Find out if start_note event is needed, and do it if needed. +*/ +void +Midi_walker::do_start_note (Midi_note *note) { - Moment stop_mom = note_l->duration() + 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_l->pitch_i() ) { - if ( stop_note_queue[ i ].key < stop_mom ) - stop_note_queue[ i ].ignore_b_ = true; - else // skip the stopnote - return; + 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; + } } } - Midi_note_event e; - e.val = new Midi_note_off( note_l ); - e.key = stop_mom; - stop_note_queue.insert( e ); - - output_event( ptr()->audio_column_l_->at_mom(), note_l ); + 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); + } } /** - Output note events for all notes which end before #max_mom# - */ + 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 (Moment max_mom) { - while ( stop_note_queue.size() && stop_note_queue.front().key <= max_mom ) { - Midi_note_event e = stop_note_queue.get(); - if ( e.ignore_b_ ) - continue; - - Moment stop_mom = e.key; - Midi_note_off* note_l = e.val; - - output_event( stop_mom, note_l ); + 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); } } -/** - 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( Moment now_mom, Midi_item* l ) +Midi_walker::output_event (Moment now_mom, Midi_item *l) { - Moment delta_t = now_mom - last_mom_ ; - last_mom_ += delta_t; - track_l_->add( delta_t, l ); + 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() +Midi_walker::process () +{ + Audio_item *audio = (*items_)[index_]; + do_stop_notes (audio->audio_column_->when ()); + + 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); + } +} + +bool +Midi_walker::ok () const { - do_stop_notes( ptr()->audio_column_l_->at_mom() ); - - Midi_item* p = ptr()->midi_item_p(); - p->channel_i_ = track_l_->number_i_; - - if ( p->name() != Midi_note::static_name() ) - output_event( ptr()->audio_column_l_->at_mom(), p ); - else - do_start_note( (Midi_note*)p ); - - delete p; + return index_ < items_->size (); } +void +Midi_walker::operator ++ (int) +{ + assert (ok ()); + index_++; +}