release: 1.0.1

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

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index 08fa4c14e903efef077fa0ca7e8c0fab2a02a259..bcbbc9d501961648ec39e1b74aab550aa52da127 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 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "lyric-performer.hh"
@@ -14,7 +14,7 @@
 
 
 IMPLEMENT_IS_TYPE_B1(Lyric_performer,Performer);
-ADD_THIS_PERFORMER(Lyric_performer);
+ADD_THIS_TRANSLATOR(Lyric_performer);
 
 Lyric_performer::Lyric_performer()
 {
@@ -28,27 +28,27 @@ void
 Lyric_performer::do_print() const
 {
 #ifndef NPRINT
-    if ( lreq_arr_.size() )
-       lreq_arr_[ 0 ]->print();
+  if (lreq_arr_.size())
+    lreq_arr_[ 0 ]->print();
 #endif
 }
 
 void
-Lyric_performer::process_requests()
+Lyric_performer::do_process_requests()
 {
-    if ( lreq_arr_.size() )
-       play( new Audio_text( Audio_text::LYRIC, lreq_arr_[ 0 ]->tdef_p_->text_str_ ) );
-    lreq_arr_.clear();
+  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();
 }
 
 bool
-Lyric_performer::do_try_request( Request* req_l )
+Lyric_performer::do_try_request (Request* req_l)
 {
-    Musical_req* m_l = req_l->musical();
-    if ( !m_l || ! m_l->lreq_l() ) 
-       return false;
-    lreq_arr_.push( m_l->lreq_l() );
+  Musical_req* m_l = req_l->access_Musical_req ();
+  if (!m_l || ! m_l->access_Lyric_req ()) 
+    return false;
+  lreq_arr_.push (m_l->access_Lyric_req ());
 
-    return true;
+  return true;
 }