patch::: 1.3.96.jcn9

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

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index be719e1c032c258f185c17f8f05b08e5cb7fa417..4557f43076481c043189dd39fba1340da4d06cd5 100644 (file)
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "lyric-performer.hh"
@@ -17,21 +17,17 @@ 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::do_process_music ()
 {
-  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);
     }