X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-pq-engraver.cc;h=45b4ff2b359d7aca819c4ab074145eb9df430e4a;hb=01b15679731ac5fcaf8edac1ad5bce6acba10ff0;hp=10644e7775c47754bc756361b31378a28538d8af;hpb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;p=lilypond.git diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc index 10644e7775..45b4ff2b35 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--2015 Han-Wen Nienhuys - (c) 2001--2005 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,15 +22,32 @@ #include "grob.hh" #include "warn.hh" +#include "translator.icc" + +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); 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 () @@ -32,12 +60,13 @@ Grob_pq_engraver::initialize () 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") +LY_DEFINE (ly_grob_pq_less_p, "ly:grob-pq (scm_car (a)), + *unsmob (scm_car (b))) < 0) return SCM_BOOL_T; else return SCM_BOOL_F; @@ -46,32 +75,46 @@ LY_DEFINE (ly_grob_pq_less_p, "ly:grob-pq-less?", void Grob_pq_engraver::acknowledge_grob (Grob_info gi) { - Music *m = gi.music_cause (); + Stream_event *ev = gi.event_cause (); - if (m - && !gi.grob_->internal_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); - 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 @@ -80,13 +123,9 @@ Grob_pq_engraver::stop_translation_timestep () 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); - } + while (scm_is_pair (busy) && *unsmob (scm_caar (busy)) == now) + busy = scm_cdr (busy); - if (start_busy != busy) - context ()->set_property ("busyGrobs", busy); } void @@ -96,11 +135,11 @@ Grob_pq_engraver::start_translation_timestep () SCM start_busy = get_property ("busyGrobs"); SCM busy = start_busy; - while (scm_is_pair (busy) && *unsmob_moment (scm_caar (busy)) < now) + while (scm_is_pair (busy) && *unsmob (scm_caar (busy)) < now) { /* - The grob-pq-engraver is not water tight, and stuff like - tupletSpannerDuration confuses it. + The grob-pq-engraver is not water tight, and stuff like + tupletSpannerDuration confuses it. */ busy = scm_cdr (busy); } @@ -109,15 +148,18 @@ Grob_pq_engraver::start_translation_timestep () context ()->set_property ("busyGrobs", busy); } +ADD_ACKNOWLEDGER (Grob_pq_engraver, grob); ADD_TRANSLATOR (Grob_pq_engraver, + /* doc */ + "Administrate when certain grobs (e.g., note heads) stop" + " playing.", + + /* create */ + "", - /* 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. \ -", + /* read */ + "busyGrobs ", - /* creats*/ "",\ - /* accepts */ "",\ - /* acks */ "grob-interface",\ - /* reads */ "busyGrobs",\ - /* write */ "busyGrobs"); + /* write */ + "busyGrobs " + );