release: 1.0.1

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

diff --git a/lily/include/midi-walker.hh b/lily/include/midi-walker.hh
index 2eac3747d600cd35f1a7a291ae5ccee9372f90fd..3be3395e621f2a75b9530708b4380a0788fdadb5 100644 (file)
--- a/lily/include/midi-walker.hh
+++ b/lily/include/midi-walker.hh
@@ -1,52 +1,48 @@
 /*
   midi-walker.hh -- declare Midi_walker
 
-  (c) 1996,97 Han-Wen Nienhuys, Jan Nieuwenhuizen <jan@digicash.com>
-  */
+  (c) 1996,  1997--1998 Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+                 Jan Nieuwenhuizen <janneke@gnu.org>
+ */
 
-#ifndef MIDIWALKER_HH
-#define MIDIWALKER_HH
+#ifndef MIDI_WALKER_HH
+#define MIDI_WALKER_HH
 
-#include "lily-proto.hh"
-#include "grouping.hh"
-#include "staff-walker.hh"
+#include "proto.hh"
+#include "plist.hh"
 #include "pcursor.hh"
 #include "pqueue.hh"
-struct Note_event : PQueue_ent<Moment,Melodic_req*>
+#include "lily-proto.hh"
+#include "moment.hh"
+
+struct Midi_note_event : PQueue_ent<Moment, Midi_note_off*>
 {
     bool ignore_b_;
-    Note_event() { 
-       ignore_b_ = false;
-    }
+    Midi_note_event();
 };
 
-int compare(Note_event const&, Note_event const&);
+int compare (Midi_note_event const& left, Midi_note_event const& right);
 
 /**
-  a simple walker which collects midi stuff, and then outputs.
-
-  Should derive from Staff_walker
+  walk audio and output midi
   */
-class Midi_walker : public PCursor<Staff_column*> 
+class Midi_walker : public PCursor<Audio_item*> 
 {
-    Midi_track *track_l_;
-    
-    PQueue< Note_event > stop_notes;
-
-    Moment last_moment_;
-
-    /* *************** */
-    void do_stop_notes(Moment);
-    void do_start_note(Note_req *note_l);
-    void output_event(Midi_item&, Moment);
 public:
-    
-    Midi_walker(Staff*, Midi_track*);
-    void process_requests();
+    Midi_walker (Audio_staff* audio_staff_l, Midi_track* midi_track_l);
     ~Midi_walker();
-};
 
+    void process();
 
-#endif // MIDIWALKER_HH
+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_;
+};
 
 
+#endif // MIDI_WALKER_HH