X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-walker.hh;h=f23b7407e89aa8e59f05ff76fe3d307389e8e438;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=e899f0057280e74925c022668fee84593ed8e8b1;hpb=bb36bac02a64770871780231ecc709cb18b20932;p=lilypond.git

diff --git a/lily/include/midi-walker.hh b/lily/include/midi-walker.hh
index e899f00572..f23b7407e8 100644
--- a/lily/include/midi-walker.hh
+++ b/lily/include/midi-walker.hh
@@ -1,50 +1,66 @@
 /*
-  midi-walker.hh -- declare Midi_walker
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996,  1997--2000 Han-Wen Nienhuys  <hanwen@cs.uu.nl>
-                 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  Copyright (C) 1996--2015 Han-Wen Nienhuys  <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
+
+  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 <http://www.gnu.org/licenses/>.
+*/
 
 #ifndef MIDI_WALKER_HH
 #define MIDI_WALKER_HH
 
-#include "proto.hh"
 #include "pqueue.hh"
 #include "lily-proto.hh"
 #include "moment.hh"
 
-struct Midi_note_event : PQueue_ent<Moment, Midi_note*>
+struct Midi_note_event : PQueue_ent<int, Midi_note *>
 {
-  bool ignore_b_;
-  Midi_note_event();
+  bool ignore_;
+  Midi_note_event ();
 };
 
-int compare (Midi_note_event const& left, Midi_note_event const& right);
+int compare (Midi_note_event const &left, Midi_note_event const &right);
 
 /**
-  walk audio and output midi
-  */
+   walk audio and output midi
+*/
 class Midi_walker
 {
 public:
-  Midi_walker (Audio_staff* audio_staff_l, Midi_track* midi_track_l);
-  ~Midi_walker();
+  Midi_walker (Audio_staff *audio_staff, Midi_track *midi_track, int start_tick);
+  ~Midi_walker ();
 
-  void process();
+  void process ();
   void operator ++(int);
   bool ok () const;
+  void finalize ();
+
 private:
-  void do_start_note (Midi_note* note_p);
-  void do_stop_notes (Moment now_mom);
-  void output_event (Moment now_mom, Midi_item* l);
-
-  Midi_track* track_l_;
-  Audio_staff* staff_l_;
-  int index_;
-  Link_array<Audio_item> * item_l_arr_l_;
+  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 *);
+  Midi_track *track_;
+  bool percussion_;
+  bool merge_unisons_;
+  vsize index_;
+  vector<Audio_item *> items_;
   PQueue<Midi_note_event> stop_note_queue;
-  Moment last_mom_;
-};
+  int last_tick_;
 
+  vector<Midi_item *> midi_events_;
+};
 
 #endif // MIDI_WALKER_HH