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 e8c8892339c85784b87f93bec8c8cc77ca56676d..935f06c35eb42e1e9a76a49a1fb715b9c988c291 100644 (file)
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,44 +3,72 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lyric-performer.hh"
-#include "text-def.hh"
-#include "musical-request.hh"
 #include "audio-item.hh"
+#include "performer.hh"
+#include "music.hh"
 
+class Lyric_performer : public Performer
+{
+public:
+  TRANSLATOR_DECLARATIONS (Lyric_performer);
+protected:
 
+  virtual bool try_music (Music *event);
+  void stop_translation_timestep ();
+   void process_music ();
 
-IMPLEMENT_IS_TYPE_B1(Lyric_performer,Performer);
-ADD_THIS_TRANSLATOR(Lyric_performer);
+private:
+  vector<Music*> events_;
+  Audio_text *audio_;
+};
 
-void 
-Lyric_performer::do_print() const
+Lyric_performer::Lyric_performer ()
+{
+  audio_ = 0;
+}
+
+void
+Lyric_performer::process_music ()
 {
-#ifndef NPRINT
-  if (lreq_arr_.size())
-    lreq_arr_[0]->print();
-#endif
+  // FIXME: won't work with fancy lyrics
+  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 (events_[0]->get_property ("text")));
+      Audio_element_info info (audio_, events_[0]);
+      announce_element (info);
+    }
+  events_.clear ();
 }
 
 void
-Lyric_performer::do_process_requests()
+Lyric_performer::stop_translation_timestep ()
 {
-  if (lreq_arr_.size() && lreq_arr_[0]->text_str_.length_i())
-    play (new Audio_text (Audio_text::LYRIC, lreq_arr_[0]->text_str_));
-  lreq_arr_.clear();
+  if (audio_)
+    {
+      play_element (audio_);
+      audio_ = 0;
+    }
+  events_.clear ();
 }
 
 bool
-Lyric_performer::do_try_request (Request* 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",
+               "", "");