source file of the GNU LilyPond music typesetter
- (c) 2001--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2001--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "context.hh"
{
Grob *grob_;
Moment end_;
- static int compare (Grob_pq_entry const &a,
- Grob_pq_entry const &b)
- {
- return Moment::compare (a.end_, b.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 ();
- DECLARE_ACKNOWLEDGER(grob);
+ DECLARE_ACKNOWLEDGER (grob);
void start_translation_timestep ();
void stop_translation_timestep ();
- Array<Grob_pq_entry> started_now_;
+ vector<Grob_pq_entry> started_now_;
};
Grob_pq_engraver::Grob_pq_engraver ()
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;
Grob_pq_entry e;
e.grob_ = gi.grob ();
e.end_ = end;
-
- started_now_.push (e);
+
+ started_now_.push_back (e);
}
}
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);
- }
+ busy = scm_cdr (busy);
- started_now_.sort (Grob_pq_entry::compare);
+ vector_sort (started_now_, less<Grob_pq_entry> ());
SCM lst = SCM_EOL;
SCM *tail = &lst;
- for (int i = 0; i < started_now_.size (); i++)
+ 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);
+ tail = SCM_CDRLOC (*tail);
}
-
+
busy = scm_merge_x (lst, busy, ly_grob_pq_less_p_proc);
context ()->set_property ("busyGrobs", busy);
}
#include "translator.icc"
-ADD_ACKNOWLEDGER(Grob_pq_engraver, grob);
+ADD_ACKNOWLEDGER (Grob_pq_engraver, grob);
ADD_TRANSLATOR (Grob_pq_engraver,
- /* descr */ "Administrate when certain grobs (eg. note heads) stop playing",
- /* creats*/ "",
- /* accepts */ "",
- /* reads */ "busyGrobs",
+ /* doc */ "Administrate when certain grobs (eg. note heads) stop playing",
+ /* create */ "",
+ /* read */ "busyGrobs",
/* write */ "busyGrobs");