X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=54a57b94515fa72d5be2ce7d7e51fcdba307e478;hb=8ce1127e14ae511e75d1d101e2dd7116684579e7;hp=c9dd4ac4454cc3feb2b0bd1523d969c8101b3b0d;hpb=7f6816438d66f6d70db5b68454d80656a0f3f131;p=lilypond.git

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index c9dd4ac445..54a57b9451 100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #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
@@ -22,14 +22,14 @@ public:
   TRANSLATOR_DECLARATIONS (Staff_performer);
   ~Staff_performer ();
 
-  String new_instrument_string ();
-  String instrument_string_;
+  string new_instrument_string ();
+  string instrument_string_;
 
 protected:
-  virtual void acknowledge_audio_element (Audio_element *p);
+  virtual void acknowledge_audio_element (Audio_element_info info);
   virtual void finalize ();
   virtual void initialize ();
-  virtual void create_audio_elements ();
+  void process_music ();
   void stop_translation_timestep ();
 
 private:
@@ -44,7 +44,7 @@ private:
 
 ADD_TRANSLATOR (Staff_performer, "", "",
 		"",
-		 "", "");
+		"", "");
 
 Staff_performer::Staff_performer ()
 {
@@ -63,19 +63,27 @@ void
 Staff_performer::initialize ()
 {
   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 ());
+  Rational r = robust_scm2moment (get_property ("tempoWholesPerMinute"),
+				  Moment (15,1)).main_part_;
+
+  r *= Rational (4,1);
+  
+  tempo_ = new Audio_tempo (r.to_int ());
+
+  audio_staff_->add_audio_item (name_);
+  audio_staff_->add_audio_item (tempo_);
+  
+  announce_element (Audio_element_info (audio_staff_, 0));
+  announce_element (Audio_element_info (name_, 0));
   announce_element (Audio_element_info (tempo_, 0));
 }
 
 void
-Staff_performer::create_audio_elements ()
+Staff_performer::process_music ()
 {
-  String str = new_instrument_string ();
+  string str = new_instrument_string ();
   if (str.length ())
     {
       instrument_name_ = new Audio_text (Audio_text::INSTRUMENT_NAME, str);
@@ -83,6 +91,9 @@ Staff_performer::create_audio_elements ()
       instrument_ = new Audio_instrument (str);
       announce_element (Audio_element_info (instrument_, 0));
 
+      audio_staff_->add_audio_item (instrument_);
+      audio_staff_->add_audio_item (instrument_name_);
+     
       /*
 	Have to be here before notes arrive into the staff.
       */
@@ -96,7 +107,7 @@ Staff_performer::stop_translation_timestep ()
 {
   SCM proc = ly_lily_module_constant ("percussion?");
 
-  SCM drums = scm_call_1 (proc, ly_symbol2scm (instrument_string_.to_str0 ()));
+  SCM drums = scm_call_1 (proc, ly_symbol2scm (instrument_string_.c_str ()));
   audio_staff_->channel_ = (drums == SCM_BOOL_T ? 9 : -1);
   if (name_)
     {
@@ -119,7 +130,7 @@ Staff_performer::finalize ()
   audio_staff_ = 0;
 }
 
-String
+string
 Staff_performer::new_instrument_string ()
 {
   // mustn't ask Score for instrument: it will return piano!
@@ -135,11 +146,9 @@ Staff_performer::new_instrument_string ()
 }
 
 void
-Staff_performer::acknowledge_audio_element (Audio_element *p)
+Staff_performer::acknowledge_audio_element (Audio_element_info inf)
 {
-  if (Audio_item *ai = dynamic_cast<Audio_item *> (p))
-    {
-      audio_staff_->add_audio_item (ai);
-    }
+  if (Audio_item *ai = dynamic_cast<Audio_item *> (inf.elem_))
+    audio_staff_->add_audio_item (ai);
 }