/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2001--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2001--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "grob.hh"
#include "warn.hh"
+#include "translator.icc"
+
struct Grob_pq_entry
{
Grob *grob_;
};
bool
-operator< (Grob_pq_entry const &a, Grob_pq_entry const &b)
+operator < (Grob_pq_entry const &a, Grob_pq_entry const &b)
{
return a.end_ < b.end_;
}
TRANSLATOR_DECLARATIONS (Grob_pq_engraver);
protected:
virtual void initialize ();
- DECLARE_ACKNOWLEDGER (grob);
+ void acknowledge_grob (Grob_info);
void start_translation_timestep ();
void stop_translation_timestep ();
void process_acknowledged ();
-
+
vector<Grob_pq_entry> started_now_;
};
-Grob_pq_engraver::Grob_pq_engraver ()
+Grob_pq_engraver::Grob_pq_engraver (Context *c)
+ : Engraver (c)
{
}
}
LY_DEFINE (ly_grob_pq_less_p, "ly:grob-pq<?",
- 2, 0, 0, (SCM a, SCM b),
- "Compare two grob priority queue entries."
- " This is an internal function.")
+ 2, 0, 0, (SCM a, SCM b),
+ "Compare two grob priority queue entries."
+ " This is an internal function.")
{
- if (Moment::compare (*unsmob_moment (scm_car (a)),
- *unsmob_moment (scm_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;
Moment l = get_event_length (ev, n);
if (!l.to_bool ())
- return;
+ return;
Moment end = n + l;
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);
+ started_now_[i].grob_->self_scm (),
+ SCM_EOL);
tail = SCM_CDRLOC (*tail);
}
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)
+ while (scm_is_pair (busy) && *unsmob<Moment> (scm_caar (busy)) == now)
busy = scm_cdr (busy);
}
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<Moment> (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);
}
- if (start_busy != busy)
+ if (!scm_is_eq (start_busy, busy))
context ()->set_property ("busyGrobs", busy);
}
-#include "translator.icc"
-ADD_ACKNOWLEDGER (Grob_pq_engraver, grob);
+void
+Grob_pq_engraver::boot ()
+{
+ ADD_ACKNOWLEDGER (Grob_pq_engraver, grob);
+}
+
ADD_TRANSLATOR (Grob_pq_engraver,
- /* doc */
- "Administrate when certain grobs (e.g., note heads) stop"
- " playing.",
+ /* doc */
+ "Administrate when certain grobs (e.g., note heads) stop"
+ " playing.",
- /* create */
- "",
+ /* create */
+ "",
- /* read */
- "busyGrobs ",
+ /* read */
+ "busyGrobs ",
- /* write */
- "busyGrobs "
- );
+ /* write */
+ "busyGrobs "
+ );