release: 0.1.61

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

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index aa24dcac2501e7a34c7a57a32952ae7371a8d7ee..d81875c95e72fb5bd1dffedf9a3c1a032efdc90e 100644 (file)
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,20 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-           Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>
 */
 
 #include "lyric-performer.hh"
+#include "text-def.hh"
 #include "musical-request.hh"
-//#include "text-item.hh"
-//#include "paper-def.hh"
-//#include "lookup.hh"
+#include "audio-item.hh"
+
 
 
-IMPLEMENT_STATIC_NAME(Lyric_performer);
 IMPLEMENT_IS_TYPE_B1(Lyric_performer,Performer);
-ADD_THIS_PERFORMER(Lyric_performer);
+ADD_THIS_TRANSLATOR(Lyric_performer);
 
 Lyric_performer::Lyric_performer()
 {
@@ -26,37 +24,31 @@ Lyric_performer::~Lyric_performer()
 {
 }
 
-bool
-Lyric_performer::do_try_request( Request* req_l )
+void 
+Lyric_performer::do_print() const
 {
-    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;
+#ifndef NPRINT
+  if (lreq_arr_.size())
+       lreq_arr_[ 0 ]->print();
+#endif
 }
 
 void
 Lyric_performer::do_process_requests()
 {
-#if 0
-    Text_item * last_item_l =0;
-    for (int i=0; i < lreq_arr_.size(); i++) {
-       Text_item *lp = new Text_item(lreq_arr_[i]->tdef_p_ );
-       lp->dir_i_ = -1;
-       lp->fat_b_ = true;
-       if (last_item_l)
-           lp->add_support(last_item_l);
-       last_item_l = lp;
-       typeset_element(lp);
-    }
-#endif
+  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_));
+  lreq_arr_.clear();
 }
 
-void
-Lyric_performer::do_post_move_processing()
+bool
+Lyric_performer::do_try_request (Request* req_l)
 {
-    lreq_arr_.set_size(0);
+  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;
 }