X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=f7ff09da207ca65914ae71699059e7358e4f7321;hb=e37010af17faa8b185de836664b6544bd29dc1d0;hp=99eed10c50585acf6d8ea94d7e80a4c7d1dfc399;hpb=cec6dfa6bf0fb931eb7f42b1ee44ca2ec19a9f34;p=lilypond.git

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 99eed10c50..f7ff09da20 100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -3,72 +3,156 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (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"
 
-IMPLEMENT_IS_TYPE_B1(Staff_performer,Performer_group_performer);
-ADD_THIS_TRANSLATOR(Staff_performer);
+/** Perform a staff. Individual notes should have their instrument
+ (staff-wide) set, so we override play_element ()
 
-Staff_performer::Staff_performer()
+  */
+class Staff_performer : public Performer_group_performer 
 {
-  audio_staff_p_ = 0;
+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_;
+};
+
+ENTER_DESCRIPTION (Staff_performer, "", "",
+		   "",
+		   "", "", "");
+
+Staff_performer::Staff_performer ()
+{
+  audio_staff_ = 0;
+  instrument_ = 0;
+  instrument_name_ = 0;
+  name_ = 0;
+  tempo_ = 0;
 }
 
-Staff_performer::~Staff_performer()
+Staff_performer::~Staff_performer ()
 {
-  delete audio_staff_p_;
 }
 
 void
-Staff_performer::do_creation_processing()
+Staff_performer::initialize ()
 {
-  audio_staff_p_ = new Audio_staff;
+  audio_staff_ = new Audio_staff;
+  announce_element (Audio_element_info (audio_staff_, 0));
+
+  name_ = new Audio_text (Audio_text::TRACK_NAME, daddy_context_->id_string_);
+  announce_element (Audio_element_info (name_, 0));
 
-  if (instrument_str().length_i()) 
+  tempo_ = new Audio_tempo (get_tempo ());
+  announce_element (Audio_element_info (tempo_, 0));
+
+  Performer_group_performer::initialize ();
+}
+
+void
+Staff_performer::create_audio_elements ()
+{
+  String str = new_instrument_string ();
+  if (str.length ())
     {
-      // staff name
-      play (new Audio_text (Audio_text::TRACK_NAME, id_str_));
-      // instrument description
-      play (new Audio_text (Audio_text::INSTRUMENT_NAME, 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));
     }
+  Performer_group_performer::create_audio_elements ();
+}
 
-  // tempo
-  play (new Audio_tempo (get_tempo_i ()));
-
-  if (instrument_str ().length_i ())
-    // instrument
-    play (new Audio_instrument (instrument_str ()));
-  Performer_group_performer::do_creation_processing ();
+void
+Staff_performer::stop_translation_timestep ()
+{
+  /*
+    UGH. -> don't use eval.
+  */
+  static SCM proc;
+  if (!proc)
+    proc = scm_primitive_eval (ly_symbol2scm ("percussion?"));
+  
+  SCM drums = gh_call1 (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;
+    }
+  if (instrument_name_)
+    {
+      play_element (instrument_name_);
+      instrument_name_ = 0;
+    }
+  if (instrument_)
+    {
+      play_element (instrument_);
+      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::instrument_str() 
+Staff_performer::new_instrument_string () 
 { 
-  return get_property ("instrument");
+  // mustn't ask Score for instrument: it will return piano!
+  SCM minstr = get_property ("midiInstrument");
+
+  if (!gh_string_p (minstr)
+      || ly_scm2string (minstr) == instrument_string_)
+    return "";
+
+  instrument_string_ = ly_scm2string (minstr);
+
+  return instrument_string_;
 }
 
 void 
-Staff_performer::play (Audio_element* p)
+Staff_performer::play_element (Audio_element* p)
 {
-  if (p->is_type_b (Audio_item::static_name())) 
+  if (Audio_item *ai = dynamic_cast<Audio_item *> (p)) 
     {
-      audio_staff_p_->add ((Audio_item*)p);
+      audio_staff_->add_audio_item (ai);
     }
-  Performer::play (p);
+  Performer::play_element (p);
 }