-/*
- 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2001--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "context.hh"
#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);
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<Grob_pq_entry> started_now_;
};
-
Grob_pq_engraver::Grob_pq_engraver ()
{
}
void
Grob_pq_engraver::initialize ()
{
- 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 priority queue entries. Internal")
+LY_DEFINE (ly_grob_pq_less_p, "ly:grob-pq<?",
+ 2, 0, 0, (SCM a, SCM b),
+ "Compare 2 grob priority queue entries. Internal")
{
- if (Moment::compare (*unsmob_moment (ly_car (a)),
- *unsmob_moment (ly_car (b))) < 0)
+ 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
- && !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);
if (!l.to_bool ())
- return ;
-
+ return;
+
if (n.grace_part_)
{
l.grace_part_ = l.main_part_;
}
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<Grob_pq_entry> ());
+ 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 ();
SCM start_busy = get_property ("busyGrobs");
SCM busy = start_busy;
- while (scm_is_pair (busy) && *unsmob_moment (ly_caar (busy)) == now)
- {
- busy = ly_cdr (busy);
- }
+ while (scm_is_pair (busy) && *unsmob_moment (scm_caar (busy)) == now)
+ busy = scm_cdr (busy);
- if (start_busy != busy)
- context ()->set_property ("busyGrobs", busy);
}
void
SCM start_busy = get_property ("busyGrobs");
SCM busy = start_busy;
- while (scm_is_pair (busy) && *unsmob_moment (ly_caar (busy)) < now)
+ while (scm_is_pair (busy) && *unsmob_moment (scm_caar (busy)) < now)
{
/*
The grob-pq-engraver is not water tight, and stuff like
tupletSpannerDuration confuses it.
- */
- busy = ly_cdr (busy);
+ */
+ busy = scm_cdr (busy);
}
if (start_busy != 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");