* flower

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

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index d15a5071847e1bd83df0377215dce70f0b470fed..7c2aa33c9b59d84343762184d20a28ed7095477f 100644 (file)
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,48 +3,43 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "event.hh"
 #include "audio-item.hh"
-#include "lily-proto.hh"
 #include "performer.hh"
-#include "array.hh"
 
-class Lyric_performer : public Performer {
+class Lyric_performer : public Performer
+{
 public:
-  TRANSLATOR_DECLARATIONS(Lyric_performer);
+  TRANSLATOR_DECLARATIONS (Lyric_performer);
 protected:
 
-  virtual bool try_music (Music* req);
+  virtual bool try_music (Music *req);
   virtual void stop_translation_timestep ();
   virtual void create_audio_elements ();
 
 private:
   Link_array<Music> lreqs_;
-  Audio_text* audio_;
+  Audio_text *audio_;
 };
 
 
-
-
 Lyric_performer::Lyric_performer ()
 {
   audio_ = 0;
 }
 
-
 void
 Lyric_performer::create_audio_elements ()
 {
   // FIXME: won't work with fancy lyrics
   if (lreqs_.size ()
-      && gh_string_p (lreqs_[0]->get_mus_property ("text"))
-      && ly_scm2string (lreqs_[0]->get_mus_property ("text")).length ())
+      && scm_is_string (lreqs_[0]->get_property ("text"))
+      && ly_scm2string (lreqs_[0]->get_property ("text")).length ())
     {
       audio_ = new Audio_text (Audio_text::LYRIC,
-                                ly_scm2string (lreqs_[0]->get_mus_property ("text")));
+                              ly_scm2string (lreqs_[0]->get_property ("text")));
       Audio_element_info info (audio_, lreqs_[0]);
       announce_element (info);
     }
@@ -63,7 +58,7 @@ Lyric_performer::stop_translation_timestep ()
 }
 
 bool
-Lyric_performer::try_music (Music* req)
+Lyric_performer::try_music (Music *req)
 {
   if (req->is_mus_type ("lyric-event"))
     {
@@ -73,4 +68,4 @@ Lyric_performer::try_music (Music* req)
   return false;
 }
 
-ENTER_DESCRIPTION(Lyric_performer,"","","lyric-event","","","");
+ADD_TRANSLATOR (Lyric_performer, "", "", "lyric-event", "", "", "");