X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-performer.cc;h=e21b7fab350bf52886e10e40e76150c87ba8ccd0;hb=9e1dc8e44017d472fda6533cc749a8918f5b72a6;hp=aa24dcac2501e7a34c7a57a32952ae7371a8d7ee;hpb=eeafd68c62481b0d10c292f0e4bfa5d821168c87;p=lilypond.git

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index aa24dcac25..e21b7fab35 100644
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,60 +3,65 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-           Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lyric-performer.hh"
-#include "musical-request.hh"
-//#include "text-item.hh"
-//#include "paper-def.hh"
-//#include "lookup.hh"
+#include "audio-item.hh"
+#include "performer.hh"
+#include "stream-event.hh"
+#include "translator.icc"
 
-
-IMPLEMENT_STATIC_NAME(Lyric_performer);
-IMPLEMENT_IS_TYPE_B1(Lyric_performer,Performer);
-ADD_THIS_PERFORMER(Lyric_performer);
-
-Lyric_performer::Lyric_performer()
+class Lyric_performer : public Performer
 {
-}
+public:
+  TRANSLATOR_DECLARATIONS (Lyric_performer);
+protected:
+
+  void stop_translation_timestep ();
+  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (lyric);
+private:
+  vector<Stream_event *> events_;
+  Audio_text *audio_;
+};
 
-Lyric_performer::~Lyric_performer()
+Lyric_performer::Lyric_performer ()
 {
+  audio_ = 0;
 }
 
-bool
-Lyric_performer::do_try_request( Request* req_l )
+void
+Lyric_performer::process_music ()
 {
-    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;
+  // FIXME: won't work with fancy lyrics
+  if (events_.size ()
+      && scm_is_string (events_[0]->get_property ("text"))
+      && ly_scm2string (events_[0]->get_property ("text")).length ())
+    {
+      audio_ = new Audio_text (Audio_text::LYRIC,
+			       ly_scm2string (events_[0]->get_property ("text")));
+      Audio_element_info info (audio_, events_[0]);
+      announce_element (info);
+    }
+  events_.clear ();
 }
 
 void
-Lyric_performer::do_process_requests()
+Lyric_performer::stop_translation_timestep ()
 {
-#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);
+  if (audio_)
+    {
+      audio_ = 0;
     }
-#endif
+  events_.clear ();
 }
 
+IMPLEMENT_TRANSLATOR_LISTENER (Lyric_performer, lyric);
 void
-Lyric_performer::do_post_move_processing()
+Lyric_performer::listen_lyric (Stream_event *event)
 {
-    lreq_arr_.set_size(0);
+  events_.push_back (event);
 }
 
+ADD_TRANSLATOR (Lyric_performer, "", "",
+		"", "");