X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-pq-engraver.cc;h=476cae950ca61cece500a96b27fd0f510742ca77;hb=a276a19dc6bd57832db3107f2f2cbb04cb4677b6;hp=bf46d20166ad0edbb81e27fef6499bf37b8b0fe2;hpb=2246ad52dd3535de56cf07ea5dbc7c51ad8cfc68;p=lilypond.git diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc index bf46d20166..476cae950c 100644 --- a/lily/grob-pq-engraver.cc +++ b/lily/grob-pq-engraver.cc @@ -1,152 +1,150 @@ -/* - grob-pq-engraver.cc -- implement Grob_pq_engraver +/* + grob-pq-engraver.cc -- implement Grob_pq_engraver source file of the GNU LilyPond music typesetter - (c) 2001--2003 Han-Wen Nienhuys + (c) 2001--2007 Han-Wen Nienhuys */ -#include "translator-group.hh" +#include "context.hh" #include "engraver.hh" #include "grob.hh" #include "warn.hh" -struct Grob_mom +struct Grob_pq_entry { - Grob * grob_ ; + Grob *grob_; Moment end_; - Grob_mom () {} - Grob_mom (Grob*gr, Moment e) - { - grob_ = gr; - end_ = e; - } }; -int compare (Grob_mom const &a, Grob_mom const &b) +bool +operator< (Grob_pq_entry const &a, Grob_pq_entry const &b) { - return Moment::compare (a.end_, b.end_); + return a.end_ < b.end_; } - -class Grob_pq_engraver: public Engraver +class Grob_pq_engraver : public Engraver { public: - TRANSLATOR_DECLARATIONS(Grob_pq_engraver); - - Array current_grobs_; + TRANSLATOR_DECLARATIONS (Grob_pq_engraver); protected: virtual void initialize (); - virtual void acknowledge_grob (Grob_info); - virtual void start_translation_timestep (); - virtual void stop_translation_timestep (); + DECLARE_ACKNOWLEDGER (grob); + void start_translation_timestep (); + void stop_translation_timestep (); + void process_acknowledged (); + + vector started_now_; }; - -Grob_pq_engraver::Grob_pq_engraver() +Grob_pq_engraver::Grob_pq_engraver () { } - void Grob_pq_engraver::initialize () { - daddy_trans_->set_property ("busyGrobs", SCM_EOL); + context ()->set_property ("busyGrobs", SCM_EOL); +} + +LY_DEFINE (ly_grob_pq_less_p, "ly:grob-pq-less?", + 2, 0, 0, (SCM a, SCM b), + "Compare 2 grob priority queue entries. Internal") +{ + if (Moment::compare (*unsmob_moment (scm_car (a)), + *unsmob_moment (scm_car (b))) < 0) + return SCM_BOOL_T; + else + return SCM_BOOL_F; } void Grob_pq_engraver::acknowledge_grob (Grob_info gi) { - Music * m = gi.music_cause (); + Stream_event *ev = gi.event_cause (); - if (m) + if (ev + && !gi.grob ()->internal_has_interface (ly_symbol2scm ("multi-measure-interface"))) { Moment n = now_mom (); - Moment l = m->get_length (); + Moment l = get_event_length (ev); if (!l.to_bool ()) - return ; - + return; + if (n.grace_part_) { l.grace_part_ = l.main_part_; l.main_part_ = 0; } - current_grobs_.push (Grob_mom (gi.grob_, n + l)); + Moment end = n + l; + + Grob_pq_entry e; + e.grob_ = gi.grob (); + e.end_ = end; + + started_now_.push_back (e); } } -LY_DEFINE(ly_grob_pq_less_p, - "ly:grob-pq-less?", 2 , 0 ,0, (SCM a, SCM b), - "Compare 2 Grob PQ entries. Internal") +void +Grob_pq_engraver::process_acknowledged () { - if ( Moment::compare (*unsmob_moment (gh_car (a)), - *unsmob_moment (gh_car (b))) < 0) - return SCM_BOOL_T; - else - return SCM_BOOL_F; + vector_sort (started_now_, less ()); + SCM lst = SCM_EOL; + SCM *tail = &lst; + for (vsize i = 0; i < started_now_.size (); i++) + { + *tail = scm_acons (started_now_[i].end_.smobbed_copy (), + started_now_[i].grob_->self_scm (), + SCM_EOL); + tail = SCM_CDRLOC (*tail); + } + + SCM busy = get_property ("busyGrobs"); + busy = scm_merge_x (lst, busy, ly_grob_pq_less_p_proc); + context ()->set_property ("busyGrobs", busy); + + started_now_.clear (); } - void Grob_pq_engraver::stop_translation_timestep () { - Moment now = now_mom(); - - current_grobs_.sort (&compare); - SCM current_list = SCM_EOL; - for (int i = current_grobs_.size(); i--;) - current_list = scm_cons (scm_cons (current_grobs_[i].end_.smobbed_copy(), - current_grobs_[i].grob_->self_scm ()), current_list); + Moment now = now_mom (); + SCM start_busy = get_property ("busyGrobs"); + SCM busy = start_busy; + while (scm_is_pair (busy) && *unsmob_moment (scm_caar (busy)) == now) + busy = scm_cdr (busy); - /* - We generate some garbage here. - */ - SCM busy = get_property ("busyGrobs"); - while (gh_pair_p (busy) && *unsmob_moment (gh_caar (busy)) == now) - { - busy = gh_cdr (busy); - } - - busy = scm_merge_x (current_list, busy, ly_grob_pq_less_p_proc); - current_grobs_.clear (); - daddy_trans_->set_property ("busyGrobs", busy); } void Grob_pq_engraver::start_translation_timestep () { - Moment now = now_mom(); + Moment now = now_mom (); SCM start_busy = get_property ("busyGrobs"); SCM busy = start_busy; - while (gh_pair_p (busy) && *unsmob_moment (gh_caar (busy)) < now) + while (scm_is_pair (busy) && *unsmob_moment (scm_caar (busy)) < now) { /* - Todo: do something sensible. The grob-pq-engraver is not water - tight, and stuff like tupletSpannerDuration confuses it. - */ - programming_error (_f("Skipped something?\nGrob %s ended before I expected it to end.", unsmob_grob (gh_cdar (busy))->name().to_str0())); - - busy = gh_cdr (busy); + The grob-pq-engraver is not water tight, and stuff like + tupletSpannerDuration confuses it. + */ + busy = scm_cdr (busy); } if (start_busy != busy) - daddy_trans_->set_property ("busyGrobs", busy); - + context ()->set_property ("busyGrobs", busy); } +#include "translator.icc" +ADD_ACKNOWLEDGER (Grob_pq_engraver, grob); +ADD_TRANSLATOR (Grob_pq_engraver, -ENTER_DESCRIPTION(Grob_pq_engraver, - -/* descr */ "Administrate when certain grobs (eg. note heads) stop playing; this \ -engraver is a sort-of a failure, since it doesn't handle all sorts of \ -borderline cases very well. \ -", \ - -/* creats*/ "", \ -/* accepts */ "", \ -/* acks */ "grob-interface", \ -/* reads */ "busyGrobs", \ -/* write */ "busyGrobs"); + /* doc */ "Administrate when certain grobs (eg. note heads) stop playing", + /* create */ "", + /* read */ "busyGrobs", + /* write */ "busyGrobs");