X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-performer.cc;h=32e874ee7e25b1974993f89ce7c75f61a99dd236;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=81014b9d5df526522d8042636c1eb4669c320ac6;hpb=6a0ea5e307744ad53d8b4a7381f2b27c2cfc9c13;p=lilypond.git

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index 81014b9d5d..32e874ee7e 100644
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,55 +3,76 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lyric-performer.hh"
-#include "text-def.hh"
-#include "musical-request.hh"
-#include "midi-item.hh"
+#include "audio-item.hh"
+#include "performer.hh"
+#include "stream-event.hh"
+#include "translator.icc"
 
+class Lyric_performer : public Performer
+{
+public:
+  TRANSLATOR_DECLARATIONS (Lyric_performer);
+protected:
 
-IMPLEMENT_STATIC_NAME(Lyric_performer);
-IMPLEMENT_IS_TYPE_B1(Lyric_performer,Performer);
-ADD_THIS_PERFORMER(Lyric_performer);
+  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;
 }
 
-Lyric_performer::~Lyric_performer()
+void
+Lyric_performer::process_music ()
 {
+  // 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_print() const
+void
+Lyric_performer::stop_translation_timestep ()
 {
-#ifndef NPRINT
-    if ( lreq_arr_.size() )
-    	lreq_arr_[ 0 ]->print();
-#endif
+  if (audio_)
+    {
+      audio_ = 0;
+    }
+  events_.clear ();
 }
 
+IMPLEMENT_TRANSLATOR_LISTENER (Lyric_performer, lyric);
 void
-Lyric_performer::process_requests()
+Lyric_performer::listen_lyric (Stream_event *event)
 {
-    if ( lreq_arr_.size() ) {
-	Midi_text t( Midi_text::LYRIC, lreq_arr_[ 0 ]->tdef_p_->text_str_ );
-	play_event( &t );
-    }
-
-    lreq_arr_.clear();
+  events_.push_back (event);
 }
 
-bool
-Lyric_performer::try_request( Request* 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() );
+ADD_TRANSLATOR (Lyric_performer,
+		/* doc */
+		"",
 
-    return true;
-}
+		/* create */
+		"",
+
+		/* read */
+		"",
 
+		/* write */
+		""
+		);