X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-pq-engraver.cc;h=57ba04f9c946c8a9cd0760cb794889b8aba11273;hb=142ef64be83a18cad0b86bfacc1f7b0140ad217b;hp=db2abd46bde4512d330a15e5a30afc7adc99abbc;hpb=6817805afca5e84e74479bdd951609b80210095b;p=lilypond.git diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc index db2abd46bd..57ba04f9c9 100644 --- a/lily/grob-pq-engraver.cc +++ b/lily/grob-pq-engraver.cc @@ -1,9 +1,20 @@ -/* - grob-pq-engraver.cc -- implement Grob_pq_engraver +/* + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2001--2011 Han-Wen Nienhuys - (c) 2001--2004 Han-Wen Nienhuys + 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 "context.hh" @@ -11,70 +22,98 @@ #include "grob.hh" #include "warn.hh" -class Grob_pq_engraver: public Engraver +struct Grob_pq_entry +{ + Grob *grob_; + Moment end_; +}; + +bool +operator< (Grob_pq_entry const &a, Grob_pq_entry const &b) +{ + return a.end_ < b.end_; +} + +class Grob_pq_engraver : public Engraver { public: - TRANSLATOR_DECLARATIONS(Grob_pq_engraver); + 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_context_->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 PQ entries. Internal") +LY_DEFINE (ly_grob_pq_less_p, "ly:grob-pqinternal_has_interface (ly_symbol2scm ("multi-measure-interface"))) + 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, n); if (!l.to_bool ()) - return ; - - if (n.grace_part_) - { - l.grace_part_ = l.main_part_; - l.main_part_ = 0; - } + return; Moment end = n + l; - SCM lst = scm_acons (end.smobbed_copy (), - gi.grob_->self_scm(), - SCM_EOL); - SCM busy= get_property ("busyGrobs"); - busy = scm_merge_x (lst, busy, ly_grob_pq_less_p_proc); - daddy_context_->set_property ("busyGrobs", busy); + Grob_pq_entry e; + e.grob_ = gi.grob (); + e.end_ = end; + + started_now_.push_back (e); } } +void +Grob_pq_engraver::process_acknowledged () +{ + 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 () @@ -82,50 +121,44 @@ Grob_pq_engraver::stop_translation_timestep () 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) - { - busy = gh_cdr (busy); - } + while (scm_is_pair (busy) && *unsmob_moment (scm_caar (busy)) == now) + busy = scm_cdr (busy); - if (start_busy != busy) - daddy_context_->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_context_->set_property ("busyGrobs", busy); - + context ()->set_property ("busyGrobs", busy); } +#include "translator.icc" +ADD_ACKNOWLEDGER (Grob_pq_engraver, grob); +ADD_TRANSLATOR (Grob_pq_engraver, + /* doc */ + "Administrate when certain grobs (e.g., note heads) stop" + " playing.", + + /* create */ + "", -ENTER_DESCRIPTION(Grob_pq_engraver, + /* read */ + "busyGrobs ", -/* 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"); + /* write */ + "busyGrobs " + );