X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsimultaneous-music-iterator.cc;h=271ae1dc7d59610b4a16ab7be3715fd3b3fd7886;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=390849e2263cae3fcfe742b080a037cdb9b6d7bb;hpb=f68bbd7a1ed1b0e7146bbbffcbcbb7f9c9bda3cc;p=lilypond.git diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc index 390849e226..271ae1dc7d 100644 --- a/lily/simultaneous-music-iterator.cc +++ b/lily/simultaneous-music-iterator.cc @@ -1,117 +1,93 @@ /* - Simultaneous_music-iterator.cc -- implement Simultaneous_music_iterator + simultaneous-music-iterator.cc -- implement Simultaneous_music_iterator source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ -#include "translator-group.hh" -#include "debug.hh" #include "simultaneous-music-iterator.hh" -#include "music-list.hh" -#include "killing-cons.tcc" - +#include "music.hh" +#include "context.hh" +#include "warn.hh" +#include "context-def.hh" Simultaneous_music_iterator::Simultaneous_music_iterator () { - separate_contexts_b_ = false; -} - -Simultaneous_music_iterator::Simultaneous_music_iterator (Simultaneous_music_iterator const& src) - : Music_iterator (src) -{ - separate_contexts_b_ = src.separate_contexts_b_; - for (Cons *p = src.children_p_list_.head_; p; p = p->next_) - { - Music_iterator *i = p->car_; - children_p_list_.append (new Killing_cons (i->clone (), 0)); - } + create_separate_contexts_ = false; + children_list_ = SCM_EOL; } -Simultaneous_music_iterator::~Simultaneous_music_iterator () +void +Simultaneous_music_iterator::derived_mark () const { - children_p_list_.junk (); + scm_gc_mark (children_list_); } -SCM -Simultaneous_music_iterator::get_music (Moment m)const +void +Simultaneous_music_iterator::derived_substitute (Context *f, Context *t) { - SCM s = SCM_EOL; - for (Cons *p = children_p_list_.head_; p; p = p->next_) - { - s = gh_append2 (p->car_->get_music (m), s); - } - return s; + for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s)) + unsmob_iterator (scm_car (s))->substitute_outlet (f, t); } void Simultaneous_music_iterator::construct_children () { int j = 0; - Music_sequence const *sim = dynamic_cast (music_l ()); - SCM i = sim->music_list (); - for (; gh_pair_p (i); i = ly_cdr (i), j++) + SCM i = get_music ()->get_property ("elements"); + + children_list_ = SCM_EOL; + SCM *tail = &children_list_; + for (; scm_is_pair (i); i = scm_cdr (i), j++) { - Music *mus = unsmob_music (ly_car (i)); - Music_iterator * mi = static_get_iterator_p (mus); + Music *mus = unsmob_music (scm_car (i)); - /* if separate_contexts_b_ is set, create a new context with the + SCM scm_iter = get_static_get_iterator (mus); + Music_iterator *mi = unsmob_iterator (scm_iter); + + /* if create_separate_contexts_ is set, create a new context with the number number as name */ - - Translator_group * t = (j && separate_contexts_b_) - ? report_to_l ()->find_create_translator_l (report_to_l ()->type_str_, - to_str (j)) - : report_to_l (); - if (!t) - t = report_to_l (); + SCM name = ly_symbol2scm (get_outlet ()->context_name ().c_str ()); + Context *c = (j && create_separate_contexts_) + ? get_outlet ()->find_create_context (name, to_string (j), SCM_EOL) + : get_outlet (); + + if (!c) + c = get_outlet (); - mi->init_translator (mus, t); + mi->init_context (mus, c); mi->construct_children (); - - if (mi->ok ()) + + if (mi->ok ()) { - children_p_list_.append (new Killing_cons (mi,0)); + *tail = scm_cons (scm_iter, *tail); + tail = SCM_CDRLOC (*tail); } else - delete mi; + mi->quit (); } } - void Simultaneous_music_iterator::process (Moment until) { - for (Cons **pp = &children_p_list_.head_; *pp;) + SCM *proc = &children_list_; + while (scm_is_pair (*proc)) { - Music_iterator * i = (*pp)->car_; - if (i->pending_moment () == until) - { - i->process (until); - } + Music_iterator *i = unsmob_iterator (scm_car (*proc)); + if (i->run_always () + || i->pending_moment () == until) + i->process (until); if (!i->ok ()) - delete children_p_list_.remove_cons (pp); - else - pp = & (*pp)->next_; - } -} - -void -Simultaneous_music_iterator::skip (Moment until) -{ - for (Cons **pp = &children_p_list_.head_; *pp;) - { - Music_iterator * i = (*pp)->car_; - if (i->pending_moment () <= until) { - i->skip (until); + i->quit (); + *proc = scm_cdr (*proc); } - if (!i->ok ()) - delete children_p_list_.remove_cons (pp); else - pp = & (*pp)->next_; + proc = SCM_CDRLOC (*proc); } } @@ -120,29 +96,48 @@ Simultaneous_music_iterator::pending_moment () const { Moment next; next.set_infinite (1); - - for (Cons *p = children_p_list_.head_; p; p = p->next_) - next = next car_->pending_moment () ; - return next; -} + for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s)) + { + Music_iterator *it = unsmob_iterator (scm_car (s)); + next = min (next, it->pending_moment ()); + } + return next; +} bool Simultaneous_music_iterator::ok () const { - return children_p_list_.head_; + bool run_always_ok = false; + for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s)) + { + Music_iterator *it = unsmob_iterator (scm_car (s)); + if (!it->run_always ()) + return true; + else + run_always_ok = run_always_ok || it->ok (); + } + return run_always_ok; } -Music_iterator* -Simultaneous_music_iterator::try_music_in_children (Music *m) const +bool +Simultaneous_music_iterator::run_always () const { - Music_iterator * b=0; - for (Cons *p = children_p_list_.head_; !b && p; p = p->next_) - b =p->car_->try_music (m); - return b; + for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s)) + { + Music_iterator *it = unsmob_iterator (scm_car (s)); + if (it->run_always ()) + return true; + } + return false; } - +void +Simultaneous_music_iterator::do_quit () +{ + for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s)) + unsmob_iterator (scm_car (s))->quit (); +} IMPLEMENT_CTOR_CALLBACK (Simultaneous_music_iterator);