X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=ee168faa824cb99f45b24378d87ac1ab08250684;hb=6c00542bf11cd4759b2e39537aeb3d9a533a3519;hp=45d47a2e63f6c8918784eaa0d72ab2d96704a211;hpb=622b379cd71af8dde94f68135a489b2536309e6f;p=lilypond.git

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 45d47a2e63..ee168faa82 100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -3,104 +3,148 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
-#include "staff-performer.hh"
-#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 ()
 
-ADD_THIS_TRANSLATOR (Staff_performer);
+  */
+class Staff_performer : public Performer_group_performer 
+{
+public:
+  TRANSLATOR_DECLARATIONS (Staff_performer);
+  ~Staff_performer ();
+
+  String new_instrument_string ();
+  String instrument_string_;
+
+protected:
+  virtual void play_element (Audio_element* p);
+  virtual void finalize ();
+  virtual void initialize ();
+  virtual void create_audio_elements ();
+  virtual void stop_translation_timestep ();
+
+private:
+  Audio_staff* audio_staff_;
+  Audio_instrument* instrument_;
+  Audio_text* instrument_name_;
+  Audio_text* name_;
+  Audio_tempo* tempo_;
+};
+
+ADD_TRANSLATOR (Staff_performer, "", "",
+		   "",
+		   "", "", "");
 
 Staff_performer::Staff_performer ()
 {
-  audio_staff_p_ = 0;
+  audio_staff_ = 0;
+  instrument_ = 0;
+  instrument_name_ = 0;
+  name_ = 0;
+  tempo_ = 0;
 }
 
 Staff_performer::~Staff_performer ()
 {
-  delete audio_staff_p_;
 }
 
 void
-Staff_performer::do_creation_processing ()
+Staff_performer::initialize ()
 {
-  audio_staff_p_ = new Audio_staff;
-
-  play (new Audio_text (Audio_text::TRACK_NAME, id_str_));
-
-#if 1
-  String str = new_instrument_str ();
-  if (str.length_i ()) 
-    // instrument description
-    play (new Audio_text (Audio_text::INSTRUMENT_NAME, str));
-#endif
-
-  // tempo
-  play (new Audio_tempo (get_tempo_i ()));
-
-#if 1
-  if (str.length_i ())
-    // instrument
-    play (new Audio_instrument (str));
-#endif
-   
-  Performer_group_performer::do_creation_processing ();
+  audio_staff_ = new Audio_staff;
+  announce_element (Audio_element_info (audio_staff_, 0));
+
+  name_ = new Audio_text (Audio_text::TRACK_NAME, context ()->id_string ());
+  announce_element (Audio_element_info (name_, 0));
+
+  tempo_ = new Audio_tempo (get_tempo ());
+  announce_element (Audio_element_info (tempo_, 0));
+
+  Performer_group_performer::initialize ();
 }
 
 void
-Staff_performer::do_process_requests ()
+Staff_performer::create_audio_elements ()
 {
-  String str = new_instrument_str ();
-  if (str.length_i ())
+  String str = new_instrument_string ();
+  if (str.length ())
     {
-      play (new Audio_text (Audio_text::INSTRUMENT_NAME, str));
-      play (new Audio_instrument (str));
+      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::do_process_requests ();
+  Performer_group_performer::create_audio_elements ();
 }
 
+void
+Staff_performer::stop_translation_timestep ()
+{
+  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 (name_);
+      name_ = 0;
+    }
+  if (tempo_)
+    {
+      play_element (tempo_);
+      tempo_ = 0;
+    }
+  instrument_name_ = 0;
+  instrument_ = 0;
+  Performer_group_performer::stop_translation_timestep ();
+}
 
 void
-Staff_performer::do_removal_processing ()
+Staff_performer::finalize ()
 {
-  Performer_group_performer::do_removal_processing ();
-  Performer::play (audio_staff_p_);
-  audio_staff_p_ = 0;
+  Performer_group_performer::finalize ();
+  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!
-  String str = get_property ("midi_instrument", 0);
-  if (!str.length_i ())
-    str = get_property ("instrument", 0);
-  if (str == instrument_str_)
-    return "";
+  SCM minstr = get_property ("midiInstrument");
 
-  instrument_str_ = str;
+  if (!scm_is_string (minstr)
+      || ly_scm2string (minstr) == instrument_string_)
+    return "";
 
-  return instrument_str_;
+  instrument_string_ = ly_scm2string (minstr);
 
-/* ugh, but can 't
-  if (properties_dict_.elem_b ("instrument"))
-    return properties_dict_["instrument"];
-  return "";
-*/
+  return instrument_string_;
 }
 
 void 
-Staff_performer::play (Audio_element* p)
+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 (p);
+  Performer::play_element (p);
 }