X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=bebb642468f2995be851d89733a7c5e935e99d70;hb=c52973e438ce3490d688860bb71849a7b3c26fef;hp=34098b04dab16c5602719b41434ecbf3848a295d;hpb=cf393d97985570aaf254a48785ad6eaa737ee4f0;p=lilypond.git

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 34098b04da..bebb642468 100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -3,69 +3,120 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "staff-performer.hh"
-#include "translator.hh"
-#include "input-translator.hh"
+#include "translator-group.hh"
 #include "debug.hh"
 #include "audio-column.hh"
 #include "audio-item.hh"
 #include "audio-staff.hh"
 
-IMPLEMENT_IS_TYPE_B1(Staff_performer,Performer_group_performer);
-ADD_THIS_PERFORMER(Staff_performer);
 
-Staff_performer::Staff_performer()
+ADD_THIS_TRANSLATOR (Staff_performer);
+
+Staff_performer::Staff_performer ()
 {
-    audio_staff_p_ = 0;
+  audio_staff_p_ = 0;
+  instrument_p_ = 0;
+  instrument_name_p_ = 0;
+  name_p_ = 0;
+  tempo_p_ = 0;
 }
 
-Staff_performer::~Staff_performer()
+Staff_performer::~Staff_performer ()
 {
-    delete audio_staff_p_;
 }
 
 void
-Staff_performer::do_creation_processing()
+Staff_performer::do_creation_processing ()
 {
-    audio_staff_p_ = new Audio_staff;
+  audio_staff_p_ = new Audio_staff;
+  announce_element (Audio_element_info (audio_staff_p_, 0));
 
-    if (instrument_str().length_i()) {
-	// staff name
-	play (new Audio_text ( Audio_text::TRACK_NAME, instrument_str ()));
-	// instrument description
-	play (new Audio_text (Audio_text::INSTRUMENT_NAME, instrument_str ()));
-    }
+  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 (instrument_str ().length_i ())
-	// instrument
-	play (new Audio_instrument (instrument_str ()));
+  Performer_group_performer::do_creation_processing ();
 }
 
 void
-Staff_performer::do_removal_processing()
+Staff_performer::do_process_music ()
 {
-    Performer::play (audio_staff_p_);
-    audio_staff_p_ = 0;
+  String str = new_instrument_str ();
+  if (str.length_i ())
+    {
+      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_music ();
+}
+
+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_element (audio_staff_p_);
+  audio_staff_p_ = 0;
 }
 
 String 
-Staff_performer::instrument_str() 
+Staff_performer::new_instrument_str () 
 { 
-    return Translator::id_str_; 
+  // mustn't ask Score for instrument: it will return piano!
+  SCM minstr = get_property (ly_symbol2scm ("midiInstrument"));
+
+  if (!gh_string_p(minstr))
+    minstr = get_property (ly_symbol2scm ("instrument"));
+
+  if (!gh_string_p (minstr)
+      || ly_scm2string (minstr) == instrument_str_)
+    return "";
+
+  instrument_str_ = ly_scm2string (minstr);
+
+  return instrument_str_;
 }
 
 void 
-Staff_performer::play (Audio_element* p)
+Staff_performer::play_element (Audio_element* p)
 {
-    if (p->is_type_b (Audio_item::static_name())) {
-	audio_staff_p_->add ((Audio_item*)p);
+  if (Audio_item *ai = dynamic_cast<Audio_item *> (p)) 
+    {
+      audio_staff_p_->add_audio_item (ai);
     }
-    Performer::play (p);
+  Performer::play_element (p);
 }