patch::: 1.3.108.jcn5

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

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index 1ba885ff19a80af32a5558d4059c32042f21c055..3d34dbf04719c15f904f0ab7d122f471d36250f9 100644 (file)
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -6,9 +6,27 @@
   (c)  1997--2000 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 do_try_music (Music* req_l);
+  virtual void do_pre_move_processing ();
+  virtual void process_acknowledged ();
+
+private:
+  Link_array<Lyric_req> lreq_arr_;
+  Audio_text* audio_p_;
+};
 
 ADD_THIS_TRANSLATOR (Lyric_performer);
 
@@ -19,14 +37,15 @@ Lyric_performer::Lyric_performer ()
 
 
 void
-Lyric_performer::do_process_music ()
+Lyric_performer::process_acknowledged ()
 {
   // FIXME: won't work with fancy lyrics
-  if (lreq_arr_.size () && gh_string_p (lreq_arr_[0]->text_)
-      && ly_scm2string (lreq_arr_[0]->text_).length_i ())
+  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,
-                                ly_scm2string (lreq_arr_[0]->text_));
+                                ly_scm2string (lreq_arr_[0]->get_mus_property ("text")));
       Audio_element_info info (audio_p_, lreq_arr_[0]);
       announce_element (info);
     }