Run grand replace for 2015.

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

diff --git a/lily/include/midi-walker.hh b/lily/include/midi-walker.hh
index 4fd1ae39fc643a6da565dc9b24aef02039209fdb..f23b7407e89aa8e59f05ff76fe3d307389e8e438 100644 (file)
--- 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--2015 Han-Wen Nienhuys  <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -39,11 +39,11 @@ int compare (Midi_note_event const &left, Midi_note_event const &right);
 class Midi_walker
 {
 public:
-  Midi_walker (Audio_staff *audio_staff, Midi_track *midi_track);
+  Midi_walker (Audio_staff *audio_staff, Midi_track *midi_track, int start_tick);
   ~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