X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-walker.hh;h=f23b7407e89aa8e59f05ff76fe3d307389e8e438;hb=9d6786b54ef766a450a2b1b89875c8adade97109;hp=15f573cbaca5206bfd4569346678e59dcfcbc766;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git diff --git a/lily/include/midi-walker.hh b/lily/include/midi-walker.hh index 15f573cbac..f23b7407e8 100644 --- a/lily/include/midi-walker.hh +++ b/lily/include/midi-walker.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1996--2011 Han-Wen Nienhuys + Copyright (C) 1996--2015 Han-Wen Nienhuys Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify @@ -39,28 +39,28 @@ int compare (Midi_note_event const &left, Midi_note_event const &right); class Midi_walker { public: - Midi_walker (Audio_staff *audio_staff, Midi_track *midi_track, - int channel); + Midi_walker (Audio_staff *audio_staff, Midi_track *midi_track, int start_tick); ~Midi_walker (); void process (); - void operator ++ (int); + void operator ++(int); bool ok () const; void finalize (); + private: void do_start_note (Midi_note *note); void do_stop_notes (int); void output_event (int, Midi_item *l); - Midi_item *get_midi (Audio_item*); - int channel_; + Midi_item *get_midi (Audio_item *); Midi_track *track_; - Audio_staff *staff_; + bool percussion_; + bool merge_unisons_; vsize index_; - vector items_; + vector items_; PQueue stop_note_queue; int last_tick_; - vector midi_events_; + vector midi_events_; }; #endif // MIDI_WALKER_HH