X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=ee168faa824cb99f45b24378d87ac1ab08250684;hb=a0c5f43a69fc72f878d7b3f635030f67f1a535db;hp=f79bf760f28a37576cd4dec5b9c6a9e31040dbef;hpb=b9c65b122d107a6f7c1a44d3041f6cfeb78fc4a2;p=lilypond.git

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index f79bf760f2..ee168faa82 100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -3,15 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
-#include "translator-group.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "audio-column.hh"
 #include "audio-item.hh"
 #include "audio-staff.hh"
 #include "performer-group-performer.hh"
+#include "context.hh"
 
 /** Perform a staff. Individual notes should have their instrument
  (staff-wide) set, so we override play_element ()
@@ -20,14 +20,11 @@
 class Staff_performer : public Performer_group_performer 
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  
-
-  Staff_performer ();
+  TRANSLATOR_DECLARATIONS (Staff_performer);
   ~Staff_performer ();
 
-  String new_instrument_str ();
-  String instrument_str_;
+  String new_instrument_string ();
+  String instrument_string_;
 
 protected:
   virtual void play_element (Audio_element* p);
@@ -37,22 +34,24 @@ protected:
   virtual void stop_translation_timestep ();
 
 private:
-  Audio_staff* audio_staff_p_;
-  Audio_instrument* instrument_p_;
-  Audio_text* instrument_name_p_;
-  Audio_text* name_p_;
-  Audio_tempo* tempo_p_;
+  Audio_staff* audio_staff_;
+  Audio_instrument* instrument_;
+  Audio_text* instrument_name_;
+  Audio_text* name_;
+  Audio_tempo* tempo_;
 };
 
-ADD_THIS_TRANSLATOR (Staff_performer);
+ADD_TRANSLATOR (Staff_performer, "", "",
+		   "",
+		   "", "", "");
 
 Staff_performer::Staff_performer ()
 {
-  audio_staff_p_ = 0;
-  instrument_p_ = 0;
-  instrument_name_p_ = 0;
-  name_p_ = 0;
-  tempo_p_ = 0;
+  audio_staff_ = 0;
+  instrument_ = 0;
+  instrument_name_ = 0;
+  name_ = 0;
+  tempo_ = 0;
 }
 
 Staff_performer::~Staff_performer ()
@@ -62,14 +61,14 @@ Staff_performer::~Staff_performer ()
 void
 Staff_performer::initialize ()
 {
-  audio_staff_p_ = new Audio_staff;
-  announce_element (Audio_element_info (audio_staff_p_, 0));
+  audio_staff_ = new Audio_staff;
+  announce_element (Audio_element_info (audio_staff_, 0));
 
-  name_p_ = new Audio_text (Audio_text::TRACK_NAME, id_str_);
-  announce_element (Audio_element_info (name_p_, 0));
+  name_ = new Audio_text (Audio_text::TRACK_NAME, context ()->id_string ());
+  announce_element (Audio_element_info (name_, 0));
 
-  tempo_p_ = new Audio_tempo (get_tempo_i ());
-  announce_element (Audio_element_info (tempo_p_, 0));
+  tempo_ = new Audio_tempo (get_tempo ());
+  announce_element (Audio_element_info (tempo_, 0));
 
   Performer_group_performer::initialize ();
 }
@@ -77,13 +76,19 @@ Staff_performer::initialize ()
 void
 Staff_performer::create_audio_elements ()
 {
-  String str = new_instrument_str ();
-  if (str.length_i ())
+  String str = new_instrument_string ();
+  if (str.length ())
     {
-      instrument_name_p_ = new Audio_text (Audio_text::INSTRUMENT_NAME, str);
-      announce_element (Audio_element_info (instrument_name_p_, 0));
-      instrument_p_ = new Audio_instrument (str);
-      announce_element (Audio_element_info (instrument_p_, 0));
+      instrument_name_ = new Audio_text (Audio_text::INSTRUMENT_NAME, str);
+      announce_element (Audio_element_info (instrument_name_, 0));
+      instrument_ = new Audio_instrument (str);
+      announce_element (Audio_element_info (instrument_, 0));
+
+      /*
+	Have to be here before notes arrive into the staff.
+       */
+      play_element (instrument_);
+      play_element (instrument_name_);
     }
   Performer_group_performer::create_audio_elements ();
 }
@@ -91,29 +96,22 @@ Staff_performer::create_audio_elements ()
 void
 Staff_performer::stop_translation_timestep ()
 {
-  SCM proc = scm_eval2 (ly_symbol2scm ("percussion-p"), SCM_EOL); 
-  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_);
-      name_p_ = 0;
-    }
-  if (tempo_p_)
-    {
-      play_element (tempo_p_);
-      tempo_p_ = 0;
-    }
-  if (instrument_name_p_)
+  SCM proc = ly_lily_module_constant ("percussion?");
+  
+  SCM drums = scm_call_1 (proc, ly_symbol2scm (instrument_string_.to_str0 ()));
+  audio_staff_->channel_ = (drums == SCM_BOOL_T ? 9 : -1 );
+  if (name_)
     {
-      play_element (instrument_name_p_);
-      instrument_name_p_ = 0;
+      play_element (name_);
+      name_ = 0;
     }
-  if (instrument_p_)
+  if (tempo_)
     {
-      play_element (instrument_p_);
-      instrument_p_ = 0;
+      play_element (tempo_);
+      tempo_ = 0;
     }
+  instrument_name_ = 0;
+  instrument_ = 0;
   Performer_group_performer::stop_translation_timestep ();
 }
 
@@ -121,26 +119,23 @@ void
 Staff_performer::finalize ()
 {
   Performer_group_performer::finalize ();
-  Performer::play_element (audio_staff_p_);
-  audio_staff_p_ = 0;
+  Performer::play_element (audio_staff_);
+  audio_staff_ = 0;
 }
 
 String 
-Staff_performer::new_instrument_str () 
+Staff_performer::new_instrument_string () 
 { 
   // mustn't ask Score for instrument: it will return piano!
-  SCM minstr = get_property (ly_symbol2scm ("midiInstrument"));
-
-  if (!gh_string_p (minstr))
-    minstr = get_property (ly_symbol2scm ("instrument"));
+  SCM minstr = get_property ("midiInstrument");
 
-  if (!gh_string_p (minstr)
-      || ly_scm2string (minstr) == instrument_str_)
+  if (!scm_is_string (minstr)
+      || ly_scm2string (minstr) == instrument_string_)
     return "";
 
-  instrument_str_ = ly_scm2string (minstr);
+  instrument_string_ = ly_scm2string (minstr);
 
-  return instrument_str_;
+  return instrument_string_;
 }
 
 void 
@@ -148,7 +143,7 @@ Staff_performer::play_element (Audio_element* p)
 {
   if (Audio_item *ai = dynamic_cast<Audio_item *> (p)) 
     {
-      audio_staff_p_->add_audio_item (ai);
+      audio_staff_->add_audio_item (ai);
     }
   Performer::play_element (p);
 }