X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-pq-engraver.cc;h=6e6cead34eece87b2817658c6ab04e7a456e3092;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=41a3dc3dfe2d350689846e984694305750eb74bc;hpb=28976d28a04cfb9abe97af7214d7dce11f732604;p=lilypond.git

diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index 41a3dc3dfe..6e6cead34e 100644
--- a/lily/grob-pq-engraver.cc
+++ b/lily/grob-pq-engraver.cc
@@ -1,9 +1,9 @@
-/*   
-  grob-pq-engraver.cc --  implement Grob_pq_engraver
+/*
+  grob-pq-engraver.cc -- implement Grob_pq_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
@@ -11,18 +11,32 @@
 #include "grob.hh"
 #include "warn.hh"
 
-class Grob_pq_engraver: public Engraver
+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);
-  virtual void start_translation_timestep ();
-  virtual void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (grob);
+  void start_translation_timestep ();
+  void stop_translation_timestep ();
+  void process_acknowledged ();
+  
+  vector<Grob_pq_entry> started_now_;
 };
 
-
 Grob_pq_engraver::Grob_pq_engraver ()
 {
 }
@@ -30,51 +44,65 @@ Grob_pq_engraver::Grob_pq_engraver ()
 void
 Grob_pq_engraver::initialize ()
 {
-  daddy_context_->set_property ("busyGrobs", SCM_EOL); 
+  context ()->set_property ("busyGrobs", SCM_EOL);
 }
 
-LY_DEFINE (ly_grob_pq_less_p, "ly:grob-pq-less?",
-	  2, 0 ,0, (SCM a, SCM b), 
-	  "Compare 2 grob priority queue entries. Internal")
+LY_DEFINE (ly_grob_pq_less_p, "ly:grob-pq<?",
+	   2, 0, 0, (SCM a, SCM b),
+	   "Compare two grob priority queue entries."
+	   "  This is an internal function.")
 {
-  if (Moment::compare (*unsmob_moment (ly_car (a)),
-		       *unsmob_moment (ly_car (b))) < 0)
+  if (Moment::compare (*unsmob_moment (scm_car (a)),
+		       *unsmob_moment (scm_car (b))) < 0)
     return SCM_BOOL_T;
   else
     return SCM_BOOL_F;
 }
-	  
+
 void
 Grob_pq_engraver::acknowledge_grob (Grob_info gi)
 {
-  Music  * m = gi.music_cause ();
+  Stream_event *ev = gi.event_cause ();
 
-  if (m
-      && !gi.grob_->internal_has_interface (ly_symbol2scm ("multi-measure-interface")))
+  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;
-	}
+	return;
 
       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);
-      daddy_context_->set_property ("busyGrobs", busy);
+      Grob_pq_entry e;
+      e.grob_ = gi.grob ();
+      e.end_ = end;
+
+      started_now_.push_back (e);
     }
 }
 
+void
+Grob_pq_engraver::process_acknowledged ()
+{
+  vector_sort (started_now_, less<Grob_pq_entry> ());
+  SCM lst = SCM_EOL;
+  SCM *tail = &lst;
+  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);
+    }
+
+  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 ()
@@ -82,13 +110,9 @@ Grob_pq_engraver::stop_translation_timestep ()
   Moment now = now_mom ();
   SCM start_busy = get_property ("busyGrobs");
   SCM busy = start_busy;
-  while (is_pair (busy) && *unsmob_moment (ly_caar (busy)) == now)
-    {
-      busy = ly_cdr (busy);
-    }
+  while (scm_is_pair (busy) && *unsmob_moment (scm_caar (busy)) == now)
+    busy = scm_cdr (busy);
 
-  if (start_busy != busy)
-    daddy_context_->set_property ("busyGrobs", busy);
 }
 
 void
@@ -98,29 +122,32 @@ Grob_pq_engraver::start_translation_timestep ()
 
   SCM start_busy = get_property ("busyGrobs");
   SCM busy = start_busy;
-  while (is_pair (busy) && *unsmob_moment (ly_caar (busy)) < now)
+  while (scm_is_pair (busy) && *unsmob_moment (scm_caar (busy)) < now)
     {
       /*
 	The grob-pq-engraver is not water tight, and stuff like
 	tupletSpannerDuration confuses it.
-       */
-      busy = ly_cdr (busy);
+      */
+      busy = scm_cdr (busy);
     }
 
   if (start_busy != busy)
-    daddy_context_->set_property ("busyGrobs", busy);
+    context ()->set_property ("busyGrobs", busy);
 }
 
+#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 */
+		"",
 
-ENTER_DESCRIPTION (Grob_pq_engraver,
+		/* read */
+		"busyGrobs ",
 
-/* 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",									  \
-/* write */       "busyGrobs");
+		/* write */
+		"busyGrobs "
+		);