release: 1.5.19

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

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 356bd2557b61399d2d7d4d271a879ca58ce85a7e..a0ff4434309ff0c571f151fd36d48a398899a5a6 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--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "translator-group.hh"
@@ -14,16 +14,13 @@
 #include "performer-group-performer.hh"
 
 /** Perform a staff. Individual notes should have their instrument
-  (staff-wide) set, so we override play_element()
+ (staff-wide) set, so we override play_element ()
 
   */
 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 ()
 {
@@ -85,11 +82,15 @@ Staff_performer::create_audio_elements ()
       instrument_p_ = new Audio_instrument (str);
       announce_element (Audio_element_info (instrument_p_, 0));
     }
+  Performer_group_performer::create_audio_elements ();
 }
 
 void
 Staff_performer::stop_translation_timestep ()
 {
+  SCM proc = scm_primitive_eval (ly_symbol2scm ("percussion-p")); 
+  SCM drums_p = gh_call1 (proc, ly_symbol2scm (instrument_str_.ch_C()));
+  audio_staff_p_->channel_i_ = (drums_p == SCM_BOOL_T ? 9 : -1 );
   if (name_p_)
     {
       play_element (name_p_);
@@ -125,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"));
+  if (!gh_string_p (minstr))
+    minstr = get_property ("instrument");
 
   if (!gh_string_p (minstr)
       || ly_scm2string (minstr) == instrument_str_)