X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-walker.hh;h=86e82a009a0d99ee1042b79858b97367e79d8e74;hb=079be3c9a14d13e594cb1c1924058322a93ca1b5;hp=c7a20f76ace44ee60a397c26da9ae26c9336799f;hpb=69b9cead5afe7164b9053d26eba582fec3825ef8;p=lilypond.git

diff --git a/lily/include/midi-walker.hh b/lily/include/midi-walker.hh
index c7a20f76ac..86e82a009a 100644
--- a/lily/include/midi-walker.hh
+++ b/lily/include/midi-walker.hh
@@ -1,48 +1,53 @@
 /*
   midi-walker.hh -- declare Midi_walker
 
-  (c) 1996,  1997--1998 Han-Wen Nienhuys  <hanwen@stack.nl>
-                 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  (c) 1996--2008 Han-Wen Nienhuys  <hanwen@xs4all.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<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
-  */
-class Midi_walker : public PCursor<Audio_item*> 
+   walk audio and output midi
+*/
+class Midi_walker
 {
 public:
-    Midi_walker (Audio_staff* audio_staff_l, Midi_track* midi_track_l);
-    ~Midi_walker();
-
-    void process();
-
+  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_;
-    PQueue<Midi_note_event> stop_note_queue;
-    Moment last_mom_;
+  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;
+  int last_tick_;
+
+  vector<Midi_item*> midi_events_;
 };
 
-
 #endif // MIDI_WALKER_HH