patch::: 1.3.96.jcn9

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

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index 08fa4c14e903efef077fa0ca7e8c0fab2a02a259..4557f43076481c043189dd39fba1340da4d06cd5 100644 (file)
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,52 +3,56 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "lyric-performer.hh"
-#include "text-def.hh"
 #include "musical-request.hh"
 #include "audio-item.hh"
 
+ADD_THIS_TRANSLATOR (Lyric_performer);
 
-
-IMPLEMENT_IS_TYPE_B1(Lyric_performer,Performer);
-ADD_THIS_PERFORMER(Lyric_performer);
-
-Lyric_performer::Lyric_performer()
+Lyric_performer::Lyric_performer ()
 {
+  audio_p_ = 0;
 }
 
-Lyric_performer::~Lyric_performer()
-{
-}
 
-void 
-Lyric_performer::do_print() const
+void
+Lyric_performer::do_process_music ()
 {
-#ifndef NPRINT
-    if ( lreq_arr_.size() )
-       lreq_arr_[ 0 ]->print();
-#endif
+  // 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,
+                                ly_scm2string (lreq_arr_[0]->get_mus_property ("text")));
+      Audio_element_info info (audio_p_, lreq_arr_[0]);
+      announce_element (info);
+    }
+  lreq_arr_.clear();
 }
 
 void
-Lyric_performer::process_requests()
+Lyric_performer::do_pre_move_processing ()
 {
-    if ( lreq_arr_.size() )
-       play( new Audio_text( Audio_text::LYRIC, lreq_arr_[ 0 ]->tdef_p_->text_str_ ) );
-    lreq_arr_.clear();
+  if (audio_p_)
+    {
+      play_element (audio_p_);
+      audio_p_ = 0;
+    }
+  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;
 }