Merge branch 'cvs-head' of ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master...

[lilypond.git] / lily / grob-pq-engraver.cc

diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index e4e8b944f968aefd5647185bc9f2ef21c87a560f..70a0e7d217e57a82d75a95d8a3cf83a533dd5f62 100644 (file)
--- a/lily/grob-pq-engraver.cc
+++ b/lily/grob-pq-engraver.cc
@@ -15,13 +15,14 @@ struct Grob_pq_entry
 {
   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:
@@ -59,13 +60,13 @@ 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
+  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;
@@ -95,7 +96,7 @@ Grob_pq_engraver::stop_translation_timestep ()
   while (scm_is_pair (busy) && *unsmob_moment (scm_caar (busy)) == now)
     busy = scm_cdr (busy);
 
-  vector_sort (started_now_, Grob_pq_entry::compare);
+  vector_sort (started_now_, less<Grob_pq_entry> ());
   SCM lst = SCM_EOL;
   SCM *tail = &lst;
   for (vsize i = 0; i < started_now_.size (); i++)
@@ -138,6 +139,5 @@ ADD_TRANSLATOR (Grob_pq_engraver,
 
                /* doc */ "Administrate when certain grobs (eg. note heads) stop playing",
                /* create */ "",
-               /* accept */ "",
                /* read */ "busyGrobs",
                /* write */ "busyGrobs");