X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-pq-engraver.cc;h=eee3d7d7076e2201b511102e035138da01d7195b;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=80d072b404fff458548a8ccb1b9b435f5bffbe7b;hpb=621e5fb6a5c3cb67c46082e561cffad691ead30c;p=lilypond.git

diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index 80d072b404..eee3d7d707 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--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
@@ -32,7 +32,8 @@ protected:
   DECLARE_ACKNOWLEDGER (grob);
   void start_translation_timestep ();
   void stop_translation_timestep ();
-
+  void process_acknowledged ();
+  
   vector<Grob_pq_entry> started_now_;
 };
 
@@ -46,9 +47,10 @@ Grob_pq_engraver::initialize ()
   context ()->set_property ("busyGrobs", SCM_EOL);
 }
 
-LY_DEFINE (ly_grob_pq_less_p, "ly:grob-pq-less?",
+LY_DEFINE (ly_grob_pq_less_p, "ly:grob-pq<?",
 	   2, 0, 0, (SCM a, SCM b),
-	   "Compare 2 grob priority queue entries. Internal")
+	   "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)
@@ -60,23 +62,17 @@ 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, n);
 
       if (!l.to_bool ())
 	return;
 
-      if (n.grace_part_)
-	{
-	  l.grace_part_ = l.main_part_;
-	  l.main_part_ = 0;
-	}
-
       Moment end = n + l;
 
       Grob_pq_entry e;
@@ -88,14 +84,8 @@ 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_, less<Grob_pq_entry> ());
   SCM lst = SCM_EOL;
   SCM *tail = &lst;
@@ -107,12 +97,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 ()
 {
@@ -136,9 +138,16 @@ Grob_pq_engraver::start_translation_timestep ()
 #include "translator.icc"
 ADD_ACKNOWLEDGER (Grob_pq_engraver, grob);
 ADD_TRANSLATOR (Grob_pq_engraver,
+		/* doc */
+		"Administrate when certain grobs (e.g., note heads) stop"
+		" playing.",
+
+		/* create */
+		"",
+
+		/* read */
+		"busyGrobs ",
 
-		/* doc */ "Administrate when certain grobs (eg. note heads) stop playing",
-		/* create */ "",
-		/* accept */ "",
-		/* read */ "busyGrobs",
-		/* write */ "busyGrobs");
+		/* write */
+		"busyGrobs "
+		);