X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-walker.cc;h=d9765c681450931fe85acca5c81213a90a153001;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=941e64c282932e753a97c1aa494327d339929ef8;hpb=1b344bd7394e98933bc482a7b64b8af681a96861;p=lilypond.git diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc index 941e64c282..d9765c6814 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--2007 Han-Wen Nienhuys + Copyright (C) 1997--2015 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,6 +23,7 @@ #include "audio-column.hh" #include "audio-staff.hh" #include "midi-item.hh" +#include "midi-chunk.hh" #include "midi-stream.hh" #include "warn.hh" @@ -34,28 +46,35 @@ compare (Midi_note_event const &left, Midi_note_event const &right) } bool -audio_item_less (Audio_item * const a, - Audio_item * const b) +audio_item_less (Audio_item *const a, + Audio_item *const b) { - return a->get_column ()->when_ < b->get_column ()->when_; + return a->get_column ()->when_ < b->get_column ()->when_; } -Midi_walker::Midi_walker (Audio_staff *audio_staff, Midi_track *track, - int channel) +Midi_walker::Midi_walker (Audio_staff *audio_staff, Midi_track *track, int start_tick) { - channel_ = channel; track_ = track; index_ = 0; items_ = audio_staff->audio_items_; vector_sort (items_, audio_item_less); - last_tick_ = 0; + //Scores that begin with grace notes start at negative times. This + //is OK - MIDI output doesn't use absolute ticks, only differences. + last_tick_ = start_tick; + percussion_ = audio_staff->percussion_; + merge_unisons_ = audio_staff->merge_unisons_; } Midi_walker::~Midi_walker () { - do_stop_notes (INT_MAX); + 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. @@ -64,52 +83,63 @@ void Midi_walker::do_start_note (Midi_note *note) { Audio_item *ptr = items_[index_]; - int stop_ticks = int (moment_to_real (note->audio_->length_mom_) * Real (384 * 4)) - + ptr->audio_column_->ticks (); - - bool play_start = true; + 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_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 */ - delete note; - note = 0; - break; - } - } + /* if this pitch already in queue, and is not already ignored */ + if (!stop_note_queue[i].ignore_ && + 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 = int (stop_ticks); + + midi_events_.push_back (e.val); + e.key = stop_ticks; stop_note_queue.insert (e); - if (play_start) - output_event (ptr->audio_column_->ticks (), note); + output_event (now_ticks, note); } } -/** - Output note events for all notes which end before #max_mom# -*/ void Midi_walker::do_stop_notes (int max_ticks) { @@ -117,10 +147,9 @@ Midi_walker::do_stop_notes (int max_ticks) { Midi_note_event e = stop_note_queue.get (); if (e.ignore_) - { - delete e.val; - continue; - } + { + continue; + } int stop_ticks = e.key; Midi_note *note = e.val; @@ -152,23 +181,34 @@ void Midi_walker::process () { Audio_item *audio = items_[index_]; - do_stop_notes (audio->audio_column_->ticks ()); + 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_; - if (Midi_note *note = dynamic_cast (midi)) - { - if (note->audio_->length_mom_.to_bool ()) - do_start_note (note); - } + { + if (note->audio_->length_mom_.to_bool ()) + do_start_note (note); + } else - output_event (audio->audio_column_->ticks (), 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 { @@ -176,7 +216,7 @@ Midi_walker::ok () const } void -Midi_walker::operator ++ (int) +Midi_walker::operator ++(int) { assert (ok ()); index_++;