Merge with master

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

diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index a8e1081704e13c993a3cd022b2dd8c7fbba046e8..476cae950ca61cece500a96b27fd0f510742ca77 100644 (file)
--- a/lily/grob-pq-engraver.cc
+++ b/lily/grob-pq-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2007  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
@@ -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:
@@ -31,8 +32,9 @@ protected:
   DECLARE_ACKNOWLEDGER (grob);
   void start_translation_timestep ();
   void stop_translation_timestep ();
-
-  std::vector<Grob_pq_entry> started_now_;
+  void process_acknowledged ();
+  
+  vector<Grob_pq_entry> started_now_;
 };
 
 Grob_pq_engraver::Grob_pq_engraver ()
@@ -59,13 +61,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;
@@ -87,15 +89,9 @@ Grob_pq_engraver::acknowledge_grob (Grob_info gi)
 }
 
 void
-Grob_pq_engraver::stop_translation_timestep ()
+Grob_pq_engraver::process_acknowledged ()
 {
-  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);
-
-  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++)
@@ -106,12 +102,24 @@ Grob_pq_engraver::stop_translation_timestep ()
       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 (scm_caar (busy)) == now)
+    busy = scm_cdr (busy);
+
+}
+
 void
 Grob_pq_engraver::start_translation_timestep ()
 {
@@ -138,6 +146,5 @@ ADD_TRANSLATOR (Grob_pq_engraver,
 
                /* doc */ "Administrate when certain grobs (eg. note heads) stop playing",
                /* create */ "",
-               /* accept */ "",
                /* read */ "busyGrobs",
                /* write */ "busyGrobs");