release: 1.5.29

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

diff --git a/lily/include/midi-walker.hh b/lily/include/midi-walker.hh
index 313e21af3d5284050b45b73f066577506b187eb3..ee839339976820e6127043e5c6e4562497536e64 100644 (file)
--- a/lily/include/midi-walker.hh
+++ b/lily/include/midi-walker.hh
@@ -1,24 +1,21 @@
 /*
   midi-walker.hh -- declare Midi_walker
 
-  (c) 1996, 1997 Han-Wen Nienhuys  <hanwen@stack.nl>
-                 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1996--2002 Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+                 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef MIDI_WALKER_HH
 #define MIDI_WALKER_HH
 
-#include "proto.hh"
-#include "plist.hh"
-#include "pcursor.hh"
 #include "pqueue.hh"
 #include "lily-proto.hh"
 #include "moment.hh"
 
-struct Midi_note_event : PQueue_ent<Moment, Midi_note_off*>
+struct Midi_note_event : PQueue_ent<Moment, Midi_note*>
 {
-    bool ignore_b_;
-    Midi_note_event();
+  bool ignore_b_;
+  Midi_note_event ();
 };
 
 int compare (Midi_note_event const& left, Midi_note_event const& right);
@@ -26,22 +23,27 @@ int compare (Midi_note_event const& left, Midi_note_event const& right);
 /**
   walk audio and output midi
   */
-class Midi_walker : public PCursor<Audio_item*> 
+class Midi_walker
 {
 public:
-    Midi_walker (Audio_staff* audio_staff_l, Midi_track* midi_track_l);
-    ~Midi_walker();
+  Midi_walker (Audio_staff* audio_staff_l, Midi_track* midi_track_l);
+  ~Midi_walker ();
 
-    void process();
+  void process ();
+  void operator ++ (int);
+  bool ok () const;
 
 private:
-    void do_start_note (Midi_note* note_l);
-    void do_stop_notes (Moment now_mom);
-    void output_event (Moment now_mom, Midi_item* l);
-
-    Midi_track* track_l_;
-    PQueue<Midi_note_event> stop_note_queue;
-    Moment last_mom_;
+  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_;
+  PQueue<Midi_note_event> stop_note_queue;
+  Moment last_mom_;
 };