2003 -> 2004

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

diff --git a/lily/include/midi-walker.hh b/lily/include/midi-walker.hh
index 9b4c88ca90106b809f26e79e1b993a9f679672bb..040cb6fa573ecac3890788868502b1bdeade12db 100644 (file)
--- a/lily/include/midi-walker.hh
+++ b/lily/include/midi-walker.hh
@@ -1,7 +1,7 @@
 /*
   midi-walker.hh -- declare Midi_walker
 
-  (c) 1996--2000 Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys  <hanwen@cs.uu.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
@@ -15,7 +15,7 @@
 struct Midi_note_event : PQueue_ent<Moment, Midi_note*>
 {
   bool ignore_b_;
-  Midi_note_event();
+  Midi_note_event ();
 };
 
 int compare (Midi_note_event const& left, Midi_note_event const& right);
@@ -26,21 +26,22 @@ int compare (Midi_note_event const& left, Midi_note_event const& right);
 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);
+  ~Midi_walker ();
 
-  void process();
-  void operator ++(int);
+  void process ();
+  void operator ++ (int);
   bool ok () const;
+
 private:
-  void do_start_note (Midi_note* note_p);
+  void do_start_note (Midi_note* note);
   void do_stop_notes (Moment now_mom);
   void output_event (Moment now_mom, Midi_item* l);
-
-  Midi_track* track_l_;
-  Audio_staff* staff_l_;
+  
+  Midi_track* track_;
+  Audio_staff* staff_;
   int index_;
-  Link_array<Audio_item> * item_l_arr_l_;
+  Link_array<Audio_item> * items_;
   PQueue<Midi_note_event> stop_note_queue;
   Moment last_mom_;
 };