From: fred <fred>
Date: Sun, 24 Mar 2002 20:13:13 +0000 (+0000)
Subject: lilypond-1.0.1
X-Git-Tag: release/1.5.59~3013
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7877851a40763c2468f56e542451614f06365cee;p=lilypond.git

lilypond-1.0.1
---

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 8bc8a049f9..e2786de70d 100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "staff-performer.hh"
@@ -77,7 +77,9 @@ String
 Staff_performer::new_instrument_str () 
 { 
   // mustn't ask Score for instrument: it will return piano!
-  String str = get_property ("instrument");
+  String str = get_property ("midi_instrument");
+  if (!str.length_i ())
+    str = get_property ("instrument");
   if (str == instrument_str_)
     return "";
 
@@ -85,7 +87,7 @@ Staff_performer::new_instrument_str ()
 
   return instrument_str_;
 
-/* ugh, but can't
+/* ugh, but can 't
   if (properties_dict_.elt_b ("instrument"))
     return properties_dict_["instrument"];
   return "";
@@ -97,7 +99,7 @@ Staff_performer::play (Audio_element* p)
 {
   if (p->is_type_b (Audio_item::static_name ())) 
     {
-      audio_staff_p_->add ( (Audio_item*)p);
+      audio_staff_p_->add_audio_item ( (Audio_item*)p);
     }
   Performer::play (p);
 }