source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "audio-item.hh"
TRANSLATOR_DECLARATIONS (Lyric_performer);
protected:
- virtual bool try_music (Music *req);
- virtual void stop_translation_timestep ();
- virtual void create_audio_elements ();
+ virtual bool try_music (Music *event);
+ void stop_translation_timestep ();
+ void process_music ();
private:
- Link_array<Music> lreqs_;
+ Link_array<Music> events_;
Audio_text *audio_;
};
}
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
play_element (audio_);
audio_ = 0;
}
- lreqs_.clear ();
+ events_.clear ();
}
bool
-Lyric_performer::try_music (Music *req)
+Lyric_performer::try_music (Music *event)
{
- if (req->is_mus_type ("lyric-event"))
+ if (event->is_mus_type ("lyric-event"))
{
- lreqs_.push (req);
+ events_.push (event);
return true;
}
return false;
}
-ADD_TRANSLATOR (Lyric_performer, "", "", "lyric-event", "", "", "");
+#include "translator.icc"
+
+ADD_TRANSLATOR (Lyric_performer, "", "", "lyric-event",
+ "", "");