Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index 9d747f4e772c3a03a5f970b1770b4a01be6faa8a..935f06c35eb42e1e9a76a49a1fb715b9c988c291 100644 (file)
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "audio-item.hh"
@@ -16,12 +16,12 @@ public:
   TRANSLATOR_DECLARATIONS (Lyric_performer);
 protected:
 
-  virtual bool try_music (Music *req);
-  virtual void stop_translation_timestep ();
-  virtual void create_audio_elements ();
+  virtual bool try_music (Music *event);
+  void stop_translation_timestep ();
+   void process_music ();
 
 private:
-  Link_array<Music> lreqs_;
+  vector<Music*> events_;
   Audio_text *audio_;
 };
 
@@ -31,19 +31,19 @@ Lyric_performer::Lyric_performer ()
 }
 
 void
-Lyric_performer::create_audio_elements ()
+Lyric_performer::process_music ()
 {
   // FIXME: won't work with fancy lyrics
-  if (lreqs_.size ()
-      && scm_is_string (lreqs_[0]->get_property ("text"))
-      && ly_scm2string (lreqs_[0]->get_property ("text")).length ())
+  if (events_.size ()
+      && scm_is_string (events_[0]->get_property ("text"))
+      && ly_scm2string (events_[0]->get_property ("text")).length ())
     {
       audio_ = new Audio_text (Audio_text::LYRIC,
-                              ly_scm2string (lreqs_[0]->get_property ("text")));
-      Audio_element_info info (audio_, lreqs_[0]);
+                              ly_scm2string (events_[0]->get_property ("text")));
+      Audio_element_info info (audio_, events_[0]);
       announce_element (info);
     }
-  lreqs_.clear ();
+  events_.clear ();
 }
 
 void
@@ -54,18 +54,21 @@ Lyric_performer::stop_translation_timestep ()
       play_element (audio_);
       audio_ = 0;
     }
-  lreqs_.clear ();
+  events_.clear ();
 }
 
 bool
-Lyric_performer::try_music (Music *req)
+Lyric_performer::try_music (Music *event)
 {
-  if (req->is_mus_type ("lyric-event"))
+  if (event->is_mus_type ("lyric-event"))
     {
-      lreqs_.push (req);
+      events_.push_back (event);
       return true;
     }
   return false;
 }
 
-ADD_TRANSLATOR (Lyric_performer, "", "", "lyric-event", "", "", "");
+#include "translator.icc"
+
+ADD_TRANSLATOR (Lyric_performer, "", "", "lyric-event",
+               "", "");