Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / drum-note-performer.cc

diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc
index e0a0606df3ef53ceab91b40c157dcb39eb80d884..a29b7a1dee7986a512317066d44f61c7e603fd92 100644 (file)
--- a/lily/drum-note-performer.cc
+++ b/lily/drum-note-performer.cc
@@ -25,8 +25,8 @@ protected:
   void process_music ();
 
 private:
-  Link_array<Music> note_evs_;
-  Link_array<Audio_note> notes_;
+  vector<Music*> note_evs_;
+  vector<Audio_note*> notes_;
 };
 
 Drum_note_performer::Drum_note_performer ()
@@ -40,7 +40,8 @@ Drum_note_performer::process_music ()
 
   while (note_evs_.size ())
     {
-      Music *n = note_evs_.pop ();
+      Music *n = note_evs_.back ();
+      note_evs_.pop_back ();
       SCM sym = n->get_property ("drum-type");
       SCM defn = SCM_EOL;
 
@@ -53,7 +54,7 @@ Drum_note_performer::process_music ()
          Audio_note *p = new Audio_note (*pit, n->get_length (), 0);
          Audio_element_info info (p, n);
          announce_element (info);
-         notes_.push (p);
+         notes_.push_back (p);
        }
     }
 
@@ -66,7 +67,7 @@ Drum_note_performer::stop_translation_timestep ()
   // why don't grace notes show up here?
   // --> grace notes effectively do not get delayed
   Moment now = now_mom ();
-  for (int i = 0; i < notes_.size (); i++)
+  for (vsize i = 0; i < notes_.size (); i++)
     play_element (notes_[i]);
   notes_.clear ();
   note_evs_.clear ();
@@ -77,7 +78,7 @@ Drum_note_performer::try_music (Music *ev)
 {
   if (ev->is_mus_type ("note-event"))
     {
-      note_evs_.push (ev);
+      note_evs_.push_back (ev);
       return true;
     }
   else if (ev->is_mus_type ("busy-playing-event"))