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 3d34dbf04719c15f904f0ab7d122f471d36250f9..935f06c35eb42e1e9a76a49a1fb715b9c988c291 100644 (file)
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,74 +3,72 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "musical-request.hh"
 #include "audio-item.hh"
-#include "lily-proto.hh"
 #include "performer.hh"
-#include "array.hh"
+#include "music.hh"
 
-class Lyric_performer : public Performer {
+class Lyric_performer : public Performer
+{
 public:
-  VIRTUAL_COPY_CONS(Translator);
- Lyric_performer ();
-
+  TRANSLATOR_DECLARATIONS (Lyric_performer);
 protected:
 
-  virtual bool do_try_music (Music* req_l);
-  virtual void do_pre_move_processing ();
-  virtual void process_acknowledged ();
+  virtual bool try_music (Music *event);
+  void stop_translation_timestep ();
+   void process_music ();
 
 private:
-  Link_array<Lyric_req> lreq_arr_;
-  Audio_text* audio_p_;
+  vector<Music*> events_;
+  Audio_text *audio_;
 };
 
-ADD_THIS_TRANSLATOR (Lyric_performer);
-
 Lyric_performer::Lyric_performer ()
 {
-  audio_p_ = 0;
+  audio_ = 0;
 }
 
-
 void
-Lyric_performer::process_acknowledged ()
+Lyric_performer::process_music ()
 {
   // FIXME: won't work with fancy lyrics
-  if (lreq_arr_.size ()
-      && gh_string_p (lreq_arr_[0]->get_mus_property ("text"))
-      && ly_scm2string (lreq_arr_[0]->get_mus_property ("text")).length_i ())
+  if (events_.size ()
+      && scm_is_string (events_[0]->get_property ("text"))
+      && ly_scm2string (events_[0]->get_property ("text")).length ())
     {
-      audio_p_ = new Audio_text (Audio_text::LYRIC,
-                                ly_scm2string (lreq_arr_[0]->get_mus_property ("text")));
-      Audio_element_info info (audio_p_, lreq_arr_[0]);
+      audio_ = new Audio_text (Audio_text::LYRIC,
+                              ly_scm2string (events_[0]->get_property ("text")));
+      Audio_element_info info (audio_, events_[0]);
       announce_element (info);
     }
-  lreq_arr_.clear();
+  events_.clear ();
 }
 
 void
-Lyric_performer::do_pre_move_processing ()
+Lyric_performer::stop_translation_timestep ()
 {
-  if (audio_p_)
+  if (audio_)
     {
-      play_element (audio_p_);
-      audio_p_ = 0;
+      play_element (audio_);
+      audio_ = 0;
     }
-  lreq_arr_.clear();
+  events_.clear ();
 }
 
 bool
-Lyric_performer::do_try_music (Music* req_l)
+Lyric_performer::try_music (Music *event)
 {
-  if (Lyric_req *lr = dynamic_cast <Lyric_req *> (req_l))
+  if (event->is_mus_type ("lyric-event"))
     {
-      lreq_arr_.push (lr);
+      events_.push_back (event);
       return true;
     }
   return false;
 }
 
+#include "translator.icc"
+
+ADD_TRANSLATOR (Lyric_performer, "", "", "lyric-event",
+               "", "");