X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-performer.cc;h=db78f744fe32017ee62d1282c1963066fbaff473;hb=a2991295b2c1fb36bec19de207161855ca3c1756;hp=be719e1c032c258f185c17f8f05b08e5cb7fa417;hpb=78ed9c22a8cbf56ff5390553e0a2854aa42cbbc5;p=lilypond.git

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index be719e1c03..db78f744fe 100644
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,12 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lyric-performer.hh"
 #include "musical-request.hh"
 #include "audio-item.hh"
+#include "lily-proto.hh"
+#include "performer.hh"
+#include "array.hh"
+
+class Lyric_performer : public Performer {
+public:
+  VIRTUAL_COPY_CONS (Translator);
+ Lyric_performer ();
+
+protected:
+
+  virtual bool try_music (Music* req_l);
+  virtual void stop_translation_timestep ();
+  virtual void create_audio_elements ();
+
+private:
+  Link_array<Lyric_req> lreq_arr_;
+  Audio_text* audio_p_;
+};
 
 ADD_THIS_TRANSLATOR (Lyric_performer);
 
@@ -17,40 +35,36 @@ Lyric_performer::Lyric_performer ()
   audio_p_ = 0;
 }
 
-void 
-Lyric_performer::do_print () const
-{
-#ifndef NPRINT
-  if (lreq_arr_.size ())
-    lreq_arr_[0]->print ();
-#endif
-}
 
 void
-Lyric_performer::do_process_requests ()
+Lyric_performer::create_audio_elements ()
 {
-  if (lreq_arr_.size () && lreq_arr_[0]->text_str_.length_i ())
+  // 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 ())
     {
-      audio_p_ = new Audio_text (Audio_text::LYRIC, lreq_arr_[0]->text_str_);
+      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]);
       announce_element (info);
     }
-  lreq_arr_.clear();
+  lreq_arr_.clear ();
 }
 
 void
-Lyric_performer::do_pre_move_processing ()
+Lyric_performer::stop_translation_timestep ()
 {
   if (audio_p_)
     {
       play_element (audio_p_);
       audio_p_ = 0;
     }
-  lreq_arr_.clear();
+  lreq_arr_.clear ();
 }
 
 bool
-Lyric_performer::do_try_music (Music* req_l)
+Lyric_performer::try_music (Music* req_l)
 {
   if (Lyric_req *lr = dynamic_cast <Lyric_req *> (req_l))
     {