X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=f00bb39f52b58dea23dbc5b0c0a1f07d934e189d;hb=b2cc0ee8300845fbe604b408adb597247464acc9;hp=e2786de70df6ef8888957e5f3715e669952bf27b;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index e2786de70d..f00bb39f52 100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "staff-performer.hh"
@@ -13,42 +13,34 @@
 #include "audio-item.hh"
 #include "audio-staff.hh"
 
-IMPLEMENT_IS_TYPE_B1 (Staff_performer,Performer_group_performer);
+
 ADD_THIS_TRANSLATOR (Staff_performer);
 
 Staff_performer::Staff_performer ()
 {
   audio_staff_p_ = 0;
+  instrument_p_ = 0;
+  instrument_name_p_ = 0;
+  name_p_ = 0;
+  tempo_p_ = 0;
 }
 
 Staff_performer::~Staff_performer ()
 {
-  delete audio_staff_p_;
 }
 
 void
 Staff_performer::do_creation_processing ()
 {
   audio_staff_p_ = new Audio_staff;
+  announce_element (Audio_element_info (audio_staff_p_, 0));
 
-  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
+  name_p_ = new Audio_text (Audio_text::TRACK_NAME, id_str_);
+  announce_element (Audio_element_info (name_p_, 0));
 
-  // tempo
-  play (new Audio_tempo (get_tempo_i ()));
+  tempo_p_ = new Audio_tempo (get_tempo_i ());
+  announce_element (Audio_element_info (tempo_p_, 0));
 
-#if 1
-  if (str.length_i ())
-    // instrument
-    play (new Audio_instrument (str));
-#endif
-   
   Performer_group_performer::do_creation_processing ();
 }
 
@@ -58,18 +50,45 @@ Staff_performer::do_process_requests ()
   String str = new_instrument_str ();
   if (str.length_i ())
     {
-      play (new Audio_text (Audio_text::INSTRUMENT_NAME, str));
-      play (new Audio_instrument (str));
+      instrument_name_p_ = new Audio_text (Audio_text::INSTRUMENT_NAME, str);
+      announce_element (Audio_element_info (instrument_name_p_, 0));
+      instrument_p_ = new Audio_instrument (str);
+      announce_element (Audio_element_info (instrument_p_, 0));
     }
   Performer_group_performer::do_process_requests ();
 }
 
+void
+Staff_performer::do_pre_move_processing ()
+{
+  if (name_p_)
+    {
+      play_element (name_p_);
+      name_p_ = 0;
+    }
+  if (tempo_p_)
+    {
+      play_element (tempo_p_);
+      tempo_p_ = 0;
+    }
+  if (instrument_name_p_)
+    {
+      play_element (instrument_name_p_);
+      instrument_name_p_ = 0;
+    }
+  if (instrument_p_)
+    {
+      play_element (instrument_p_);
+      instrument_p_ = 0;
+    }
+  Performer_group_performer::do_pre_move_processing ();
+}
 
 void
 Staff_performer::do_removal_processing ()
 {
   Performer_group_performer::do_removal_processing ();
-  Performer::play (audio_staff_p_);
+  Performer::play_element (audio_staff_p_);
   audio_staff_p_ = 0;
 }
 
@@ -77,30 +96,26 @@ String
 Staff_performer::new_instrument_str () 
 { 
   // mustn't ask Score for instrument: it will return piano!
-  String str = get_property ("midi_instrument");
-  if (!str.length_i ())
-    str = get_property ("instrument");
-  if (str == instrument_str_)
+  SCM minstr = get_property (ly_symbol2scm ("midiInstrument"), 0);
+
+  if (!gh_string_p(minstr))
+    minstr = get_property (ly_symbol2scm ("instrument"), 0);
+
+  if (ly_scm2string (minstr) == instrument_str_)
     return "";
 
-  instrument_str_ = str;
+  instrument_str_ = ly_scm2string (minstr);
 
   return instrument_str_;
-
-/* ugh, but can 't
-  if (properties_dict_.elt_b ("instrument"))
-    return properties_dict_["instrument"];
-  return "";
-*/
 }
 
 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 ( (Audio_item*)p);
+      audio_staff_p_->add_audio_item (ai);
     }
-  Performer::play (p);
+  Performer::play_element (p);
 }