patch::: 1.5.41.jcn1

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

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index aee7edc6a0e05c96651110648e90880c3b4c6468..57ffc8efd33151bb546da0b319d1bc5ac4090663 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "translator-group.hh"
@@ -20,10 +20,7 @@
 class Staff_performer : public Performer_group_performer 
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  
-
-  Staff_performer ();
+  TRANSLATOR_DECLARATIONS(Staff_performer);
   ~Staff_performer ();
 
   String new_instrument_str ();
@@ -44,7 +41,7 @@ private:
   Audio_tempo* tempo_p_;
 };
 
-ADD_THIS_TRANSLATOR (Staff_performer);
+ENTER_DESCRIPTION (Staff_performer, "","","","","" );
 
 Staff_performer::Staff_performer ()
 {
@@ -129,10 +126,10 @@ String
 Staff_performer::new_instrument_str () 
 { 
   // mustn't ask Score for instrument: it will return piano!
-  SCM minstr = get_property (ly_symbol2scm ("midiInstrument"));
+  SCM minstr = get_property ("midiInstrument");
 
   if (!gh_string_p (minstr))
-    minstr = get_property (ly_symbol2scm ("instrument"));
+    minstr = get_property ("instrument");
 
   if (!gh_string_p (minstr)
       || ly_scm2string (minstr) == instrument_str_)