Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 333196f9bdb23d9180927f3958503190945a582b..331e7cc60ff7ed4b9bfe710a23dbadfcf63b41d4 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
@@ -24,16 +24,16 @@ public:
 protected:
   virtual bool try_music (Music *ev);
 
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  virtual void create_audio_elements ();
+  void stop_translation_timestep ();
+  void process_music ();
 
 private:
-  Link_array<Music> note_evs_;
-  Link_array<Audio_note> notes_;
+  vector<Music*> note_evs_;
+  vector<Audio_note*> notes_;
 };
 
 void
-Note_performer::create_audio_elements ()
+Note_performer::process_music ()
 {
   if (note_evs_.size ())
     {
@@ -45,7 +45,8 @@ Note_performer::create_audio_elements ()
 
       while (note_evs_.size ())
        {
-         Music *n = note_evs_.pop ();
+         Music *n = note_evs_.back ();
+         note_evs_.pop_back ();
          SCM pit = n->get_property ("pitch");
 
          if (Pitch *pitp = unsmob_pitch (pit))
@@ -53,7 +54,7 @@ Note_performer::create_audio_elements ()
              Audio_note *p = new Audio_note (*pitp, n->get_length (), - transposing);
              Audio_element_info info (p, n);
              announce_element (info);
-             notes_.push (p);
+             notes_.push_back (p);
            }
        }
       note_evs_.clear ();
@@ -66,10 +67,8 @@ 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++)
-    {
-      play_element (notes_[i]);
-    }
+  for (vsize i = 0; i < notes_.size (); i++)
+    play_element (notes_[i]);
   notes_.clear ();
   note_evs_.clear ();
 }
@@ -79,7 +78,7 @@ 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"))
@@ -91,7 +90,9 @@ Note_performer::try_music (Music *ev)
 #include "translator.icc"
 
 ADD_TRANSLATOR (Note_performer, "", "",
-               "note-event busy-playing-event", "", "", "");
+               "note-event "
+               "busy-playing-event",
+               "", "");
 
 Note_performer::Note_performer ()
 {