X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-performer.cc;h=9ba25c5bf1f1e6c839c4a7d05b319ba8a40251be;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=8118c60d90ba7e66c0b0ef952b9ec42b3d219c2b;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index 8118c60d90..9ba25c5bf1 100644
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -1,51 +1,61 @@
 /*
-  lyric-performer.cc -- implement Lyric_performer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "audio-item.hh"
 #include "performer.hh"
+#include "stream-event.hh"
+#include "translator.icc"
 
-class Lyric_performer : public Performer {
+class Lyric_performer : public Performer
+{
 public:
   TRANSLATOR_DECLARATIONS (Lyric_performer);
 protected:
 
-  virtual bool try_music (Music* req);
-  virtual void stop_translation_timestep ();
-  virtual void create_audio_elements ();
-
+  void stop_translation_timestep ();
+  void process_music ();
+  void listen_lyric (Stream_event *);
 private:
-  Link_array<Music> lreqs_;
-  Audio_text* audio_;
+  vector<Stream_event *> events_;
+  Audio_text *audio_;
 };
 
-
-
-
-Lyric_performer::Lyric_performer ()
+Lyric_performer::Lyric_performer (Context *c)
+  : Performer (c)
 {
   audio_ = 0;
 }
 
-
 void
-Lyric_performer::create_audio_elements ()
+Lyric_performer::process_music ()
 {
   // FIXME: won't work with fancy lyrics
-  if (lreqs_.size ()
-      && scm_is_string (lreqs_[0]->get_property ("text"))
-      && ly_scm2string (lreqs_[0]->get_property ("text")).length ())
+  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 (lreqs_[0]->get_property ("text")));
-      Audio_element_info info (audio_, lreqs_[0]);
+                               ly_scm2string (events_[0]->get_property ("text")));
+      Audio_element_info info (audio_, events_[0]);
       announce_element (info);
     }
-  lreqs_.clear ();
+  events_.clear ();
 }
 
 void
@@ -53,21 +63,33 @@ Lyric_performer::stop_translation_timestep ()
 {
   if (audio_)
     {
-      play_element (audio_);
       audio_ = 0;
     }
-  lreqs_.clear ();
+  events_.clear ();
+}
+
+void
+Lyric_performer::listen_lyric (Stream_event *event)
+{
+  events_.push_back (event);
 }
 
-bool
-Lyric_performer::try_music (Music* req)
+void
+Lyric_performer::boot ()
 {
-  if (req->is_mus_type ("lyric-event"))
-    {
-      lreqs_.push (req);
-      return true;
-    }
-  return false;
+  ADD_LISTENER (Lyric_performer, lyric);
 }
 
-ENTER_DESCRIPTION (Lyric_performer,"","","lyric-event","","","");
+ADD_TRANSLATOR (Lyric_performer,
+                /* doc */
+                "",
+
+                /* create */
+                "",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );