* The grand 2005-2006 replace.

[lilypond.git] / lily / score-performer.cc

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index a8784405f04b93530625672dfdd43ef267223693..85e37a8ac2a17d16def923e433beb5411a8fe3e5 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "score-performer.hh"
@@ -19,12 +19,11 @@
 #include "context.hh"
 
 ADD_TRANSLATOR_GROUP (Score_performer,
-               /* descr */ "",
-               /* creats*/ "",
-               /* accepts */ "",
-               /* acks  */ "",
-               /* reads */ "",
-               /* write */ "");
+                     /* doc */ "",
+                     /* create */ "",
+                     /* accept */ "",
+                     /* read */ "",
+                     /* write */ "");
 
 Score_performer::Score_performer ()
 {
@@ -39,9 +38,7 @@ void
 Score_performer::play_element (Audio_element *p)
 {
   if (Audio_item *i = dynamic_cast<Audio_item *> (p))
-    {
-      audio_column_->add_audio_item (i);
-    }
+    audio_column_->add_audio_item (i);
   performance_->add_element (p);
 }
 
@@ -97,14 +94,14 @@ Score_performer::derived_mark () const
     scm_gc_mark (performance_->self_scm ());
 
   Score_translator::derived_mark ();
-  Performer_group_performer::derived_mark ();
+  Performer_group::derived_mark ();
 }
 
 void
 Score_performer::initialize ()
 {
   performance_ = new Performance;
-  scm_gc_unprotect_object (performance_->self_scm ());
+  performance_->unprotect ();
   performance_->midi_ = context ()->get_output_def ();
 
   Translator_group::initialize ();