X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-performer.cc;h=9ba25c5bf1f1e6c839c4a7d05b319ba8a40251be;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=28551a700bc238fa1b7221e14ea9c1882046704c;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc index 28551a700b..9ba25c5bf1 100644 --- a/lily/lyric-performer.cc +++ b/lily/lyric-performer.cc @@ -1,76 +1,95 @@ /* - 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 - (c) 1997--2001 Jan Nieuwenhuizen + 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 . */ -#include "musical-request.hh" #include "audio-item.hh" -#include "lily-proto.hh" #include "performer.hh" -#include "array.hh" +#include "stream-event.hh" +#include "translator.icc" -class Lyric_performer : public Performer { +class Lyric_performer : public Performer +{ public: - VIRTUAL_COPY_CONS(Translator); - Lyric_performer (); - + TRANSLATOR_DECLARATIONS (Lyric_performer); protected: - virtual bool try_music (Music* req_l); - 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 lreq_arr_; - Audio_text* audio_p_; + vector events_; + Audio_text *audio_; }; -ADD_THIS_TRANSLATOR (Lyric_performer); - -Lyric_performer::Lyric_performer () +Lyric_performer::Lyric_performer (Context *c) + : Performer (c) { - audio_p_ = 0; + audio_ = 0; } - void -Lyric_performer::create_audio_elements () +Lyric_performer::process_music () { // FIXME: won't work with fancy lyrics - if (lreq_arr_.size () - && gh_string_p (lreq_arr_[0]->get_mus_property ("text")) - && ly_scm2string (lreq_arr_[0]->get_mus_property ("text")).length_i ()) + if (events_.size () + && scm_is_string (events_[0]->get_property ("text")) + && ly_scm2string (events_[0]->get_property ("text")).length ()) { - audio_p_ = new Audio_text (Audio_text::LYRIC, - ly_scm2string (lreq_arr_[0]->get_mus_property ("text"))); - Audio_element_info info (audio_p_, lreq_arr_[0]); + audio_ = new Audio_text (Audio_text::LYRIC, + ly_scm2string (events_[0]->get_property ("text"))); + Audio_element_info info (audio_, events_[0]); announce_element (info); } - lreq_arr_.clear(); + events_.clear (); } void Lyric_performer::stop_translation_timestep () { - if (audio_p_) + if (audio_) { - play_element (audio_p_); - audio_p_ = 0; + audio_ = 0; } - lreq_arr_.clear(); + events_.clear (); } -bool -Lyric_performer::try_music (Music* req_l) +void +Lyric_performer::listen_lyric (Stream_event *event) { - if (Lyric_req *lr = dynamic_cast (req_l)) - { - lreq_arr_.push (lr); - return true; - } - return false; + events_.push_back (event); +} + +void +Lyric_performer::boot () +{ + ADD_LISTENER (Lyric_performer, lyric); } +ADD_TRANSLATOR (Lyric_performer, + /* doc */ + "", + + /* create */ + "", + + /* read */ + "", + + /* write */ + "" + );