X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-walker.hh;h=ea76a02a6d823e9ebc390a096c1f6208b1db96e5;hb=09ae845ea458bc35ffa486b4bcac25c88e2fb856;hp=4fd1ae39fc643a6da565dc9b24aef02039209fdb;hpb=e5380f29f23e204a603f8398368d2a7dc0260aa0;p=lilypond.git

diff --git a/lily/include/midi-walker.hh b/lily/include/midi-walker.hh
index 4fd1ae39fc..ea76a02a6d 100644
--- a/lily/include/midi-walker.hh
+++ b/lily/include/midi-walker.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2011 Han-Wen Nienhuys  <hanwen@xs4all.nl>
+  Copyright (C) 1996--2012 Han-Wen Nienhuys  <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -43,7 +43,7 @@ public:
   ~Midi_walker ();
 
   void process ();
-  void operator ++ (int);
+  void operator ++(int);
   bool ok () const;
   void finalize ();
 
@@ -51,16 +51,16 @@ private:
   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*); 
+  Midi_item *get_midi (Audio_item *);
   Midi_track *track_;
-  Audio_staff *staff_;
   bool percussion_;
+  bool merge_unisons_;
   vsize index_;
-  vector<Audio_item*> items_;
+  vector<Audio_item *> items_;
   PQueue<Midi_note_event> stop_note_queue;
   int last_tick_;
 
-  vector<Midi_item*> midi_events_;
+  vector<Midi_item *> midi_events_;
 };
 
 #endif // MIDI_WALKER_HH