X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-performer.cc;h=fe5ca56d119670bda44b18c52c84d3e1b4f8f678;hb=5a6772769703b907ce77fcffbaa3fb8d07128559;hp=b800f3d1adaeca6d94564677a208910c9949753b;hpb=13e79c0250d34b6bdfbafbc551ef64e8b59b2991;p=lilypond.git

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index b800f3d1ad..fe5ca56d11 100644
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,52 +3,74 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lyric-performer.hh"
-#include "text-def.hh"
 #include "musical-request.hh"
 #include "audio-item.hh"
+#include "lily-proto.hh"
+#include "performer.hh"
+#include "array.hh"
 
+class Lyric_performer : public Performer {
+public:
+  TRANSLATOR_DECLARATIONS(Lyric_performer);
+protected:
+
+  virtual bool try_music (Music* req_l);
+  virtual void stop_translation_timestep ();
+  virtual void create_audio_elements ();
+
+private:
+  Link_array<Lyric_req> lreq_arr_;
+  Audio_text* audio_p_;
+};
 
 
-IMPLEMENT_IS_TYPE_B1(Lyric_performer,Performer);
-ADD_THIS_PERFORMER(Lyric_performer);
 
-Lyric_performer::Lyric_performer()
-{
-}
 
-Lyric_performer::~Lyric_performer()
+Lyric_performer::Lyric_performer ()
 {
+  audio_p_ = 0;
 }
 
-void 
-Lyric_performer::do_print() const
+
+void
+Lyric_performer::create_audio_elements ()
 {
-#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::stop_translation_timestep ()
 {
-  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();
+  if (audio_p_)
+    {
+      play_element (audio_p_);
+      audio_p_ = 0;
+    }
+  lreq_arr_.clear ();
 }
 
 bool
-Lyric_performer::do_try_request (Request* req_l)
+Lyric_performer::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;
 }
 
+ENTER_DESCRIPTION(Lyric_performer,"","","","","");