Corrected typo by Jan

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

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index 37d17bad3cb0765d1399ec5be483d59ea7410334..f9faa7269329258d016d41b969a76d8fb6e58b79 100644 (file)
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,44 +3,68 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lyric-performer.hh"
-#include "text-def.hh"
-#include "musical-request.hh"
 #include "audio-item.hh"
+#include "performer.hh"
 
+class Lyric_performer : public Performer
+{
+public:
+  TRANSLATOR_DECLARATIONS (Lyric_performer);
+protected:
 
+  virtual bool try_music (Music *req);
+  virtual void stop_translation_timestep ();
+  virtual void create_audio_elements ();
 
+private:
+  Link_array<Music> lreqs_;
+  Audio_text *audio_;
+};
 
-ADD_THIS_TRANSLATOR(Lyric_performer);
+Lyric_performer::Lyric_performer ()
+{
+  audio_ = 0;
+}
 
-void 
-Lyric_performer::do_print() const
+void
+Lyric_performer::create_audio_elements ()
 {
-#ifndef NPRINT
-  if (lreq_arr_.size())
-    lreq_arr_[0]->print();
-#endif
+  // 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 ())
+    {
+      audio_ = new Audio_text (Audio_text::LYRIC,
+                              ly_scm2string (lreqs_[0]->get_property ("text")));
+      Audio_element_info info (audio_, lreqs_[0]);
+      announce_element (info);
+    }
+  lreqs_.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;
+    }
+  lreqs_.clear ();
 }
 
 bool
-Lyric_performer::do_try_music (Music* req_l)
+Lyric_performer::try_music (Music *req)
 {
-  if (Lyric_req *lr = dynamic_cast <Lyric_req *> (req_l))
+  if (req->is_mus_type ("lyric-event"))
     {
-      lreq_arr_.push (lr);
+      lreqs_.push (req);
       return true;
     }
   return false;
 }
 
+ADD_TRANSLATOR (Lyric_performer, "", "", "lyric-event", "", "", "");