X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-pq-engraver.cc;h=f9b56575b02a547ca5e4865e1fc58789ceabb7e2;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=57ba04f9c946c8a9cd0760cb794889b8aba11273;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git

diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index 57ba04f9c9..f9b56575b0 100644
--- a/lily/grob-pq-engraver.cc
+++ b/lily/grob-pq-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2001--2011  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2001--2014  Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@ struct Grob_pq_entry
 };
 
 bool
-operator< (Grob_pq_entry const &a, Grob_pq_entry const &b)
+operator < (Grob_pq_entry const &a, Grob_pq_entry const &b)
 {
   return a.end_ < b.end_;
 }
@@ -44,7 +44,7 @@ protected:
   void start_translation_timestep ();
   void stop_translation_timestep ();
   void process_acknowledged ();
-  
+
   vector<Grob_pq_entry> started_now_;
 };
 
@@ -59,12 +59,12 @@ Grob_pq_engraver::initialize ()
 }
 
 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.")
+           2, 0, 0, (SCM a, SCM b),
+           "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)
+  if (Moment::compare (*Moment::unsmob (scm_car (a)),
+                       *Moment::unsmob (scm_car (b))) < 0)
     return SCM_BOOL_T;
   else
     return SCM_BOOL_F;
@@ -82,7 +82,7 @@ Grob_pq_engraver::acknowledge_grob (Grob_info gi)
       Moment l = get_event_length (ev, n);
 
       if (!l.to_bool ())
-	return;
+        return;
 
       Moment end = n + l;
 
@@ -103,8 +103,8 @@ Grob_pq_engraver::process_acknowledged ()
   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);
+                         started_now_[i].grob_->self_scm (),
+                         SCM_EOL);
       tail = SCM_CDRLOC (*tail);
     }
 
@@ -121,7 +121,7 @@ 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)
+  while (scm_is_pair (busy) && *Moment::unsmob (scm_caar (busy)) == now)
     busy = scm_cdr (busy);
 
 }
@@ -133,11 +133,11 @@ Grob_pq_engraver::start_translation_timestep ()
 
   SCM start_busy = get_property ("busyGrobs");
   SCM busy = start_busy;
-  while (scm_is_pair (busy) && *unsmob_moment (scm_caar (busy)) < now)
+  while (scm_is_pair (busy) && *Moment::unsmob (scm_caar (busy)) < now)
     {
       /*
-	The grob-pq-engraver is not water tight, and stuff like
-	tupletSpannerDuration confuses it.
+        The grob-pq-engraver is not water tight, and stuff like
+        tupletSpannerDuration confuses it.
       */
       busy = scm_cdr (busy);
     }
@@ -149,16 +149,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.",
+                /* doc */
+                "Administrate when certain grobs (e.g., note heads) stop"
+                " playing.",
 
-		/* create */
-		"",
+                /* create */
+                "",
 
-		/* read */
-		"busyGrobs ",
+                /* read */
+                "busyGrobs ",
 
-		/* write */
-		"busyGrobs "
-		);
+                /* write */
+                "busyGrobs "
+               );