patch::: 1.5.0.jcn1

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

diff --git a/lily/grace-performer-group.cc b/lily/grace-performer-group.cc
index f2c8ef277651edbfa1a4f1e4f5dc321466bf7279..58a3f1fdde2373940c549ca39efc614777cbb454 100644 (file)
--- a/lily/grace-performer-group.cc
+++ b/lily/grace-performer-group.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music playter
   
-  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 #include "grace-performer-group.hh"
@@ -39,9 +39,9 @@ Grace_performer_group::finish ()
 }
 
 void
-Grace_performer_group::do_removal_processing ()
+Grace_performer_group::finalize ()
 {
-  Performer_group_performer::do_removal_processing ();
+  Performer_group_performer::finalize ();
 }
 
 void
@@ -51,7 +51,7 @@ Grace_performer_group::announce_element (Audio_element_info info)
   // do not propagate to top
   announce_to_top_.push (info);
 
-  //inf.elem_l_->set_elt_property ("grace", SCM_BOOL_T);
+  //inf.elem_l_->set_grob_property ("grace", SCM_BOOL_T);
   info.elem_l_->grace_b_ = true;
 }
 
@@ -62,19 +62,19 @@ Grace_performer_group::play_element (Audio_element*e)
 }
 
 
-Grace_performer_group::Grace_performer_group()
+Grace_performer_group::Grace_performer_group ()
 {
   calling_self_b_ = false;
 }
 
 void
-Grace_performer_group::process ()
+Grace_performer_group::one_time_step ()
 {
   calling_self_b_  = true;
-  process_requests ();
-  do_announces();
-  pre_move_processing();
-  check_removal();
+  // process_music ();
+  announces ();
+  stop_translation_timestep ();
+  check_removal ();
   calling_self_b_ = false;
 }
 
@@ -87,18 +87,13 @@ Grace_performer_group::each (Method_pointer method)
 }
 
 
-void
-Grace_performer_group::each (Const_method_pointer method) const
-{
- if (calling_self_b_)
-    Performer_group_performer::each (method);
-}
+
 
 /*
   don't let the commands trickle up.
  */
 bool
-Grace_performer_group::do_try_music (Music *m)
+Grace_performer_group::try_music (Music *m)
 {
   return try_music_on_nongroup_children (m);
 }