Run `make grand-replace'.

[lilypond.git] / lily / include / midi-walker.hh

diff --git a/lily/include/midi-walker.hh b/lily/include/midi-walker.hh
index 342983f5f16b5e5e5e7da799c88d9b8dcf61f775..86e82a009a0d99ee1042b79858b97367e79d8e74 100644 (file)
--- a/lily/include/midi-walker.hh
+++ b/lily/include/midi-walker.hh
@@ -1,9 +1,9 @@
 /*
   midi-walker.hh -- declare Midi_walker
 
-  (c) 1996--2001 Han-Wen Nienhuys  <hanwen@cs.uu.nl>
-                 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2008 Han-Wen Nienhuys  <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef MIDI_WALKER_HH
 #define MIDI_WALKER_HH
@@ -12,38 +12,42 @@
 #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_;
+  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 (Audio_staff *audio_staff, Midi_track *midi_track,
+              int channel);
   ~Midi_walker ();
 
   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*); 
+  int channel_;
+  Midi_track *track_;
+  Audio_staff *staff_;
+  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