X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music-iterator.cc;h=ca31364695edcce5113d0cf347000b1b536f7d9a;hb=f5e81dd9ca9e3621709898e6518ab7295377ac7c;hp=4124cfedb36f4ec2c4b1ad8f2b44cc0497d50979;hpb=e58fce49b3113408254011774685370b8233df17;p=lilypond.git diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc index 4124cfedb3..ca31364695 100644 --- a/lily/lyric-combine-music-iterator.cc +++ b/lily/lyric-combine-music-iterator.cc @@ -1,14 +1,12 @@ -/* - lyric-combine-music-iterator.cc -- implement Lyric_combine_music_iterator - +/* + lyric-combine-music-iterator.cc -- implement Lyric_combine_music_iterator + source file of the GNU LilyPond music typesetter - - (c) 1999--2003 Han-Wen Nienhuys - - */ -#include "translator-group.hh" -#include "lyric-combine-music.hh" + (c) 1999--2005 Han-Wen Nienhuys +*/ + +#include "context.hh" #include "event.hh" #include "note-head.hh" #include "grob.hh" @@ -17,54 +15,52 @@ class Lyric_combine_music_iterator : public Music_iterator { public: - VIRTUAL_COPY_CONS (Music_iterator); Lyric_combine_music_iterator (); - Lyric_combine_music_iterator (Lyric_combine_music_iterator const&src); - DECLARE_SCHEME_CALLBACK(constructor, ()); + Lyric_combine_music_iterator (Lyric_combine_music_iterator const &src); + DECLARE_SCHEME_CALLBACK (constructor, ()); protected: virtual void construct_children (); virtual Moment pending_moment () const; - virtual void do_quit(); + virtual void do_quit (); virtual void process (Moment); virtual Music_iterator *try_music_in_children (Music *) const; virtual bool ok () const; virtual void derived_mark () const; - virtual void derived_substitute (Translator_group*,Translator_group*) ; + virtual void derived_substitute (Context *, Context *); private: - bool get_busy_status ()const ; - bool melisma_busy (); + bool get_busy_status ()const; + bool melisma_busy (); + Music *get_combine_lyrics () const; + Music *get_combine_music () const; - Music_iterator * music_iter_; - Music_iterator * lyric_iter_; + Music_iterator *music_iter_; + Music_iterator *lyric_iter_; }; - bool -melisma_busy (Translator* tr) +melisma_busy (Context *tr) { SCM melisma_properties = tr->get_property ("melismaBusyProperties"); bool busy = false; - for (; gh_pair_p (melisma_properties); - melisma_properties = gh_cdr (melisma_properties)) - busy = busy || to_boolean (tr->internal_get_property (gh_car (melisma_properties))); + for (; scm_is_pair (melisma_properties); + melisma_properties = scm_cdr (melisma_properties)) + busy = busy || to_boolean (tr->internal_get_property (scm_car (melisma_properties))); return busy; } - - /* Ugh, why static? - */ +*/ Music *busy_req; Music *melisma_playing_req; Lyric_combine_music_iterator::Lyric_combine_music_iterator () { - music_iter_ =0; - lyric_iter_ =0; + music_iter_ = 0; + lyric_iter_ = 0; if (!busy_req) { @@ -89,30 +85,49 @@ Lyric_combine_music_iterator::ok () const } void -Lyric_combine_music_iterator::derived_mark()const +Lyric_combine_music_iterator::derived_mark ()const { if (music_iter_) - scm_gc_mark (music_iter_->self_scm()); + scm_gc_mark (music_iter_->self_scm ()); if (lyric_iter_) - scm_gc_mark (lyric_iter_->self_scm()); + scm_gc_mark (lyric_iter_->self_scm ()); } void -Lyric_combine_music_iterator::derived_substitute (Translator_group*f,Translator_group* t) +Lyric_combine_music_iterator::derived_substitute (Context *f, Context *t) { if (music_iter_) - music_iter_->substitute_outlet (f,t); + music_iter_->substitute_outlet (f, t); if (lyric_iter_) - lyric_iter_->substitute_outlet (f,t); + lyric_iter_->substitute_outlet (f, t); +} + +Music * +Lyric_combine_music_iterator::get_combine_music () const +{ + SCM l = get_music ()->get_property ("elements"); + if (!scm_is_pair (l)) + return 0; + return unsmob_music (scm_car (l)); +} + +Music * +Lyric_combine_music_iterator::get_combine_lyrics () const +{ + SCM l = get_music ()->get_property ("elements"); + if (!scm_is_pair (l)) + return 0; + l = scm_cdr (l); + if (!scm_is_pair (l)) + return 0; + return unsmob_music (scm_car (l)); } void Lyric_combine_music_iterator::construct_children () { - Lyric_combine_music const * m = dynamic_cast (get_music ()); - - music_iter_ = unsmob_iterator (get_iterator (m->get_music ())); - lyric_iter_ = unsmob_iterator (get_iterator (m->get_lyrics ())); + music_iter_ = unsmob_iterator (get_iterator (get_combine_music ())); + lyric_iter_ = unsmob_iterator (get_iterator (get_combine_lyrics ())); } bool @@ -124,17 +139,16 @@ Lyric_combine_music_iterator::get_busy_status () const instant. */ if (try_music (busy_req)) return true; - - Translator_group * tr = music_iter_->get_outlet (); + + Context *tr = music_iter_->get_outlet (); SCM grobs = tr->get_property ("busyGrobs"); - Moment now = tr->now_mom(); - for (; gh_pair_p (grobs); grobs = gh_cdr (grobs)) + Moment now = tr->now_mom (); + for (; scm_is_pair (grobs); grobs = scm_cdr (grobs)) { - SCM grob = gh_cdar (grobs); - Moment end =*unsmob_moment (gh_caar (grobs)); + SCM grob = scm_cdar (grobs); + Moment end = *unsmob_moment (scm_caar (grobs)); - /* This is slightly ugh: we are now confunding the frontend (iterators) and the backend (note heads) */ @@ -146,15 +160,12 @@ Lyric_combine_music_iterator::get_busy_status () const return false; } - bool Lyric_combine_music_iterator::melisma_busy () { - /* - We can not read the property, since music_iter_->get_outlet () might - not be the context that sets the melisma properties, but rather a - parent context. - */ + /* We cannot read the property, since music_iter_->get_outlet () might + not be the context that sets the melisma properties, but rather a + parent context. */ return music_iter_->try_music (melisma_playing_req); } @@ -164,12 +175,12 @@ Lyric_combine_music_iterator::process (Moment m) Moment my_next = music_iter_->pending_moment (); if (my_next > m) return; - + music_iter_->process (m); if (get_busy_status () && !melisma_busy () && lyric_iter_->ok ()) { - Moment m= lyric_iter_->pending_moment (); + Moment m = lyric_iter_->pending_moment (); lyric_iter_->process (m); } } @@ -178,37 +189,19 @@ void Lyric_combine_music_iterator::do_quit () { if (music_iter_) - music_iter_->quit(); - if (lyric_iter_) - lyric_iter_->quit(); -} - -Lyric_combine_music_iterator::Lyric_combine_music_iterator (Lyric_combine_music_iterator const & src) - : Music_iterator (src) -{ - lyric_iter_ = 0; - music_iter_ = 0; - - if (src.lyric_iter_) - lyric_iter_ = src.lyric_iter_->clone (); - if (src.music_iter_) - music_iter_ = src.music_iter_->clone (); - + music_iter_->quit (); if (lyric_iter_) - scm_gc_unprotect_object (lyric_iter_->self_scm()); - if (music_iter_) - scm_gc_unprotect_object (music_iter_->self_scm()); + lyric_iter_->quit (); } -Music_iterator* +Music_iterator * Lyric_combine_music_iterator::try_music_in_children (Music *m) const { - Music_iterator * i = music_iter_->try_music (m); + Music_iterator *i = music_iter_->try_music (m); if (i) return i; else return lyric_iter_->try_music (m); } - IMPLEMENT_CTOR_CALLBACK (Lyric_combine_music_iterator);