X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-pq-engraver.cc;h=70a0e7d217e57a82d75a95d8a3cf83a533dd5f62;hb=78f563e58de2de28fd17067fd434a42cb9f055a5;hp=08def8d83be11d20ffbf08fc4c42bfada4c9d42e;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git

diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index 08def8d83b..70a0e7d217 100644
--- 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--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
@@ -11,15 +11,29 @@
 #include "grob.hh"
 #include "warn.hh"
 
+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);
-  PRECOMPUTED_VIRTUAL void start_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (grob);
+  void start_translation_timestep ();
+  void stop_translation_timestep ();
+
+  vector<Grob_pq_entry> started_now_;
 };
 
 Grob_pq_engraver::Grob_pq_engraver ()
@@ -46,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;
@@ -64,13 +78,12 @@ Grob_pq_engraver::acknowledge_grob (Grob_info gi)
 	}
 
       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);
     }
 }
 
@@ -81,12 +94,23 @@ Grob_pq_engraver::stop_translation_timestep ()
   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_, less<Grob_pq_entry> ());
+  SCM lst = SCM_EOL;
+  SCM *tail = &lst;
+  for (vsize i = 0; i < started_now_.size (); i++)
     {
-      busy = scm_cdr (busy);
+      *tail = scm_acons (started_now_[i].end_.smobbed_copy (),
+			 started_now_[i].grob_->self_scm (),
+			 SCM_EOL);
+      tail = SCM_CDRLOC (*tail);
     }
 
-  if (start_busy != busy)
-    context ()->set_property ("busyGrobs", busy);
+  busy = scm_merge_x (lst, busy, ly_grob_pq_less_p_proc);
+  context ()->set_property ("busyGrobs", busy);
+
+  started_now_.clear ();
 }
 
 void
@@ -110,16 +134,10 @@ Grob_pq_engraver::start_translation_timestep ()
 }
 
 #include "translator.icc"
-
+ADD_ACKNOWLEDGER (Grob_pq_engraver, grob);
 ADD_TRANSLATOR (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",\
+		/* doc */ "Administrate when certain grobs (eg. note heads) stop playing",
+		/* create */ "",
+		/* read */ "busyGrobs",
 		/* write */ "busyGrobs");