patch::: 1.1.37.script1

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

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index d81875c95e72fb5bd1dffedf9a3c1a032efdc90e..7ae048437948789e907f8a1865bd9b74a666ee6a 100644 (file)
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,52 +3,43 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "lyric-performer.hh"
-#include "text-def.hh"
 #include "musical-request.hh"
 #include "audio-item.hh"
 
 
 
-IMPLEMENT_IS_TYPE_B1(Lyric_performer,Performer);
-ADD_THIS_TRANSLATOR(Lyric_performer);
-
-Lyric_performer::Lyric_performer()
-{
-}
 
-Lyric_performer::~Lyric_performer()
-{
-}
+ADD_THIS_TRANSLATOR(Lyric_performer);
 
 void 
 Lyric_performer::do_print() const
 {
 #ifndef NPRINT
   if (lreq_arr_.size())
-       lreq_arr_[ 0 ]->print();
+    lreq_arr_[0]->print();
 #endif
 }
 
 void
 Lyric_performer::do_process_requests()
 {
-  if (lreq_arr_.size() && lreq_arr_[ 0 ]->tdef_p_->text_str_.length_i())
-       play (new Audio_text (Audio_text::LYRIC, lreq_arr_[ 0 ]->tdef_p_->text_str_));
+  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_music (Music* 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());
-
-  return true;
+  if (Lyric_req *lr = dynamic_cast <Lyric_req *> (req_l))
+    {
+      lreq_arr_.push (lr);
+      return true;
+    }
+  return false;
 }