release: 1.5.0

[lilypond.git] / lily / grace-position-performer.cc

diff --git a/lily/grace-position-performer.cc b/lily/grace-position-performer.cc
index 41cee8065e7f9213928415ff1ea17b60a6d2ccca..7652ac98c62e295275e267971cc5dcbda224e791 100644 (file)
--- a/lily/grace-position-performer.cc
+++ b/lily/grace-position-performer.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
 
  */
 
@@ -21,9 +21,9 @@ protected:
   Link_array<Audio_note> notes_;
 
   VIRTUAL_COPY_CONS (Translator);
-  virtual void acknowledge_element (Audio_element_info);
-  virtual void process_acknowledged ();
-  virtual void do_post_move_processing ();
+  virtual void acknowledge_audio_element (Audio_element_info);
+  virtual void create_audio_elements ();
+  virtual void start_translation_timestep ();
   Global_translator* global_translator_l ();
 };
 
@@ -34,7 +34,7 @@ Grace_position_performer::Grace_position_performer ()
 }
 
 void
-Grace_position_performer::acknowledge_element (Audio_element_info i)
+Grace_position_performer::acknowledge_audio_element (Audio_element_info i)
 {
   if (Audio_note * n = dynamic_cast <Audio_note*> (i.elem_l_))
     {
@@ -46,7 +46,7 @@ Grace_position_performer::acknowledge_element (Audio_element_info i)
 }
 
 void
-Grace_position_performer::process_acknowledged ()
+Grace_position_performer::create_audio_elements ()
 {
   if (graces_.size ())
     {
@@ -60,10 +60,10 @@ Grace_position_performer::process_acknowledged ()
          for (int i=1; i < notes_.size (); i++)
            shortest_mom = shortest_mom <? notes_[i]->length_mom_;
          
-         Rational grace_fraction_rat (1, 2);
-         Scalar prop = get_property ("graceFraction", 0);
-         if (prop.length_i ())
-           grace_fraction_rat = prop.to_rat ();
+         Moment grace_fraction_rat (1, 2);
+         SCM prop = get_property ("graceFraction");
+         if (unsmob_moment (prop))
+           grace_fraction_rat = *unsmob_moment (prop);
 
          delay_mom = shortest_mom * grace_fraction_rat;
          for (int i=0; i < notes_.size (); i++)
@@ -81,7 +81,7 @@ Grace_position_performer::process_acknowledged ()
       for (int i=0; i < graces_.size (); i++)
        grace_length_mom += graces_[i]->length_mom_;
 
-      Rational grace_factor_rat = delay_mom / grace_length_mom;
+      Moment grace_factor_rat = delay_mom / grace_length_mom;
 
       for (int i=0; i < graces_.size (); i++)
        {
@@ -116,7 +116,7 @@ Grace_position_performer::global_translator_l ()
 
 
 void
-Grace_position_performer::do_post_move_processing ()
+Grace_position_performer::start_translation_timestep ()
 {
   graces_.clear ();
   notes_.clear ();