Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / staff-performer.cc

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 0a8b5a5451e9e2d6e81bfacd41a754d265b31612..b8facd23645e3abbad7fe2bb0a625ff08097a0ac 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -3,7 +3,7 @@
 
   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"
@@ -22,11 +22,11 @@ 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 ();
   void process_music ();
@@ -63,19 +63,21 @@ 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 ());
+
+  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::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 +85,9 @@ Staff_performer::process_music ()
       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 +101,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 +124,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,9 +140,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))
+  if (Audio_item *ai = dynamic_cast<Audio_item *> (inf.elem_))
     audio_staff_->add_audio_item (ai);
 }