X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=0a8b5a5451e9e2d6e81bfacd41a754d265b31612;hb=978fa09436484d8d670e8ee8b3eb8cfacd493675;hp=d8cad9bf98f8c3ea02955bf8be5a521406daa1a2;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index d8cad9bf98..0a8b5a5451 100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -3,47 +3,48 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
-#include "translator-group.hh"
 #include "warn.hh"
 #include "audio-column.hh"
 #include "audio-item.hh"
 #include "audio-staff.hh"
-#include "performer-group-performer.hh"
+#include "performer-group.hh"
+#include "context.hh"
 
 /** Perform a staff. Individual notes should have their instrument
- (staff-wide) set, so we override play_element ()
-
-  */
-class Staff_performer : public Performer_group_performer 
+    (staff-wide) set, so we override play_element ()
+*/
+class Staff_performer : public Performer
 {
 public:
-  TRANSLATOR_DECLARATIONS(Staff_performer);
+  TRANSLATOR_DECLARATIONS (Staff_performer);
   ~Staff_performer ();
 
   String new_instrument_string ();
   String instrument_string_;
 
 protected:
-  virtual void play_element (Audio_element* p);
+  virtual void acknowledge_audio_element (Audio_element *p);
   virtual void finalize ();
   virtual void initialize ();
-  virtual void create_audio_elements ();
-  virtual void stop_translation_timestep ();
+  void process_music ();
+  void stop_translation_timestep ();
 
 private:
-  Audio_staff* audio_staff_;
-  Audio_instrument* instrument_;
-  Audio_text* instrument_name_;
-  Audio_text* name_;
-  Audio_tempo* tempo_;
+  Audio_staff *audio_staff_;
+  Audio_instrument *instrument_;
+  Audio_text *instrument_name_;
+  Audio_text *name_;
+  Audio_tempo *tempo_;
 };
 
-ENTER_DESCRIPTION (Staff_performer, "", "",
-		   "",
-		   "", "", "");
+#include "translator.icc"
+
+ADD_TRANSLATOR (Staff_performer, "", "",
+		"",
+		"", "");
 
 Staff_performer::Staff_performer ()
 {
@@ -64,17 +65,15 @@ Staff_performer::initialize ()
   audio_staff_ = new Audio_staff;
   announce_element (Audio_element_info (audio_staff_, 0));
 
-  name_ = new Audio_text (Audio_text::TRACK_NAME, id_string_);
+  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::create_audio_elements ()
+Staff_performer::process_music ()
 {
   String str = new_instrument_string ();
   if (str.length ())
@@ -83,20 +82,22 @@ Staff_performer::create_audio_elements ()
       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 ();
 }
 
 void
 Staff_performer::stop_translation_timestep ()
 {
-  /*
-    UGH. -> don't use eval.
-  */
-  
-  SCM 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 );
+  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_);
@@ -107,37 +108,24 @@ Staff_performer::stop_translation_timestep ()
       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 ();
+  instrument_name_ = 0;
+  instrument_ = 0;
 }
 
 void
 Staff_performer::finalize ()
 {
-  Performer_group_performer::finalize ();
   Performer::play_element (audio_staff_);
   audio_staff_ = 0;
 }
 
-String 
-Staff_performer::new_instrument_string () 
-{ 
+String
+Staff_performer::new_instrument_string ()
+{
   // mustn't ask Score for instrument: it will return piano!
   SCM minstr = get_property ("midiInstrument");
 
-  if (!gh_string_p (minstr))
-    minstr = get_property ("instrument");
-
-  if (!gh_string_p (minstr)
+  if (!scm_is_string (minstr)
       || ly_scm2string (minstr) == instrument_string_)
     return "";
 
@@ -146,13 +134,10 @@ Staff_performer::new_instrument_string ()
   return instrument_string_;
 }
 
-void 
-Staff_performer::play_element (Audio_element* p)
+void
+Staff_performer::acknowledge_audio_element (Audio_element *p)
 {
-  if (Audio_item *ai = dynamic_cast<Audio_item *> (p)) 
-    {
-      audio_staff_->add_audio_item (ai);
-    }
-  Performer::play_element (p);
+  if (Audio_item *ai = dynamic_cast<Audio_item *> (p))
+    audio_staff_->add_audio_item (ai);
 }