patch::: 1.5.4.jcn4

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

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 72c922af9c5734862390b231dfe05963e4cda4cb..aee7edc6a0e05c96651110648e90880c3b4c6468 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,13 +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);
+  VIRTUAL_COPY_CONS (Translator);
   
 
   Staff_performer ();
@@ -31,9 +31,9 @@ public:
 
 protected:
   virtual void play_element (Audio_element* p);
-  virtual void do_removal_processing ();
-  virtual void do_creation_processing ();
-  virtual void create_grobs ();
+  virtual void finalize ();
+  virtual void initialize ();
+  virtual void create_audio_elements ();
   virtual void stop_translation_timestep ();
 
 private:
@@ -60,7 +60,7 @@ Staff_performer::~Staff_performer ()
 }
 
 void
-Staff_performer::do_creation_processing ()
+Staff_performer::initialize ()
 {
   audio_staff_p_ = new Audio_staff;
   announce_element (Audio_element_info (audio_staff_p_, 0));
@@ -71,11 +71,11 @@ Staff_performer::do_creation_processing ()
   tempo_p_ = new Audio_tempo (get_tempo_i ());
   announce_element (Audio_element_info (tempo_p_, 0));
 
-  Performer_group_performer::do_creation_processing ();
+  Performer_group_performer::initialize ();
 }
 
 void
-Staff_performer::create_grobs ()
+Staff_performer::create_audio_elements ()
 {
   String str = new_instrument_str ();
   if (str.length_i ())
@@ -85,11 +85,15 @@ Staff_performer::create_grobs ()
       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_);
@@ -114,9 +118,9 @@ Staff_performer::stop_translation_timestep ()
 }
 
 void
-Staff_performer::do_removal_processing ()
+Staff_performer::finalize ()
 {
-  Performer_group_performer::do_removal_processing ();
+  Performer_group_performer::finalize ();
   Performer::play_element (audio_staff_p_);
   audio_staff_p_ = 0;
 }
@@ -127,7 +131,7 @@ Staff_performer::new_instrument_str ()
   // mustn't ask Score for instrument: it will return piano!
   SCM minstr = get_property (ly_symbol2scm ("midiInstrument"));
 
-  if (!gh_string_p(minstr))
+  if (!gh_string_p (minstr))
     minstr = get_property (ly_symbol2scm ("instrument"));
 
   if (!gh_string_p (minstr)