source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
*/
-#include "musical-request.hh"
+#include "event.hh"
#include "audio-item.hh"
#include "lily-proto.hh"
#include "performer.hh"
class Lyric_performer : public Performer {
public:
- TRANSLATOR_DECLARATIONS(Lyric_performer);
+ TRANSLATOR_DECLARATIONS (Lyric_performer);
protected:
virtual bool try_music (Music* req);
virtual void create_audio_elements ();
private:
- Link_array<Lyric_req> lreqs_;
+ Link_array<Music> lreqs_;
Audio_text* audio_;
};
{
// 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);
}
bool
Lyric_performer::try_music (Music* req)
{
- if (Lyric_req *lr = dynamic_cast <Lyric_req *> (req))
+ if (req->is_mus_type ("lyric-event"))
{
- lreqs_.push (lr);
+ lreqs_.push (req);
return true;
}
return false;
}
-ENTER_DESCRIPTION(Lyric_performer,"","","","","");
+ENTER_DESCRIPTION (Lyric_performer,"","","lyric-event","","","");