X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-walker.cc;h=59a2c387239290c2d399d16d41aece2c1814e421;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=c2aaa085b14d5ee5eab73e2f722524db7f535d2e;hpb=adaa7aecab8595596fc6505402b40a37a04716e6;p=lilypond.git diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc index c2aaa085b1..59a2c38723 100644 --- a/lily/midi-walker.cc +++ b/lily/midi-walker.cc @@ -1,10 +1,21 @@ /* - midi-walker.cc -- implement Midi_walker + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1997--2006 Han-Wen Nienhuys + Copyright (C) 1997--2014 Han-Wen Nienhuys Jan Nieuwenhuizen + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "midi-walker.hh" @@ -12,12 +23,13 @@ #include "audio-column.hh" #include "audio-staff.hh" #include "midi-item.hh" +#include "midi-chunk.hh" #include "midi-stream.hh" #include "warn.hh" Midi_note_event::Midi_note_event () { - ignore_b_ = false; + ignore_ = false; } int @@ -33,21 +45,35 @@ compare (Midi_note_event const &left, Midi_note_event const &right) return 0; } -Midi_walker::Midi_walker (Audio_staff *audio_staff, Midi_track *track, - int channel) +bool +audio_item_less (Audio_item *const a, + Audio_item *const b) +{ + return a->get_column ()->when_ < b->get_column ()->when_; +} + +Midi_walker::Midi_walker (Audio_staff *audio_staff, Midi_track *track) { - channel_ = channel; track_ = track; index_ = 0; - items_ = &audio_staff->audio_items_; - - last_mom_ = 0; + items_ = audio_staff->audio_items_; + vector_sort (items_, audio_item_less); + //Pieces that begin with grace notes start at negative times. This + //is OK - MIDI output doesn't use absolute ticks, only differences. + last_tick_ = items_.empty () ? 0 : items_[0]->audio_column_->ticks (); + percussion_ = audio_staff->percussion_; + merge_unisons_ = audio_staff->merge_unisons_; } Midi_walker::~Midi_walker () { - // ugh - do_stop_notes (last_mom_ + Moment (Rational (10, 1))); + junk_pointers (midi_events_); +} + +void +Midi_walker::finalize () +{ + do_stop_notes (INT_MAX); } /** @@ -56,118 +82,140 @@ Midi_walker::~Midi_walker () void Midi_walker::do_start_note (Midi_note *note) { - Audio_item *ptr = (*items_)[index_]; - Moment stop_mom = note->get_length () + ptr->audio_column_->at_mom (); - - bool play_start = true; + Audio_item *ptr = items_[index_]; + assert (note->audio_ == ptr); + int now_ticks = ptr->audio_column_->ticks (); + int stop_ticks = int (moment_to_real (note->audio_->length_mom_) * + Real (384 * 4)) + now_ticks; 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 this pitch already in queue */ + if (stop_note_queue[i].val->get_semitone_pitch () + == note->get_semitone_pitch ()) + { + int queued_ticks + = stop_note_queue[i].val->audio_->audio_column_->ticks (); + // If the two notes started at the same time, or option is set, + if (now_ticks == queued_ticks || merge_unisons_) + { + // merge them. + if (stop_note_queue[i].key < stop_ticks) + { + Midi_note_event e; + e.val = stop_note_queue[i].val; + e.key = stop_ticks; + stop_note_queue[i].ignore_ = true; + stop_note_queue.insert (e); + } + note = 0; + break; + } + else + { + // A note was played that interruped a played note. + // Stop the old note, and continue to the greatest moment + // between the two. + if (stop_note_queue[i].key > stop_ticks) + { + stop_ticks = stop_note_queue[i].key; + } + output_event (now_ticks, stop_note_queue[i].val); + stop_note_queue[i].ignore_ = true; + break; + } + } } if (note) { Midi_note_event e; e.val = new Midi_note_off (note); - e.key = stop_mom; + + midi_events_.push_back (e.val); + e.key = stop_ticks; stop_note_queue.insert (e); - if (play_start) - output_event (ptr->audio_column_->at_mom (), note); + output_event (now_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_) - { - delete e.val; - continue; - } + if (e.ignore_) + { + continue; + } - Moment stop_mom = e.key; + int stop_ticks = e.key; Midi_note *note = e.val; - output_event (stop_mom, note); + 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_ = now_mom; + 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_t < Moment (0)) - delta_t = Moment (0); + if (delta_ticks < 0) + { + programming_error ("Going back in MIDI time."); + delta_ticks = 0; + } - track_->add (delta_t, l); + track_->add (delta_ticks, l); } void Midi_walker::process () { - Audio_item *audio = (*items_)[index_]; - do_stop_notes (audio->audio_column_->at_mom ()); + Audio_item *audio = items_[index_]; + Audio_column *col = audio->get_column (); + do_stop_notes (col->ticks ()); - if (Midi_item *midi = Midi_item::get_midi (audio)) + if (Midi_item *midi = 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); - } + { + if (note->audio_->length_mom_.to_bool ()) + do_start_note (note); + } else - output_event (audio->audio_column_->at_mom (), midi); + output_event (audio->audio_column_->ticks (), midi); } } +Midi_item * +Midi_walker::get_midi (Audio_item *i) +{ + Midi_item *mi = Midi_item::get_midi (i); + + if (percussion_) + if (Midi_channel_item *mci = dynamic_cast (mi)) + mci->channel_ = 9; + + midi_events_.push_back (mi); + return mi; +} + bool Midi_walker::ok () const { - return index_ < items_->size (); + return index_ < items_.size (); } void -Midi_walker::operator ++ (int) +Midi_walker::operator ++(int) { assert (ok ()); index_++;