X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=1359af5e01ea512c5f74f24a72bebba8e7bcdc6a;hb=91c6fc1cb6950a316336a242c6e971e099df8c80;hp=a1efbfcebcfcab1cab3427d989c542a1b8c7f07a;hpb=bdabe71a2bdda41b64c0000da6023771701f4def;p=lilypond.git

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index a1efbfcebc..1359af5e01 100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -3,116 +3,137 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
-
-#include "staff-performer.hh"
-#include "translator.hh"
-#include "input-translator.hh"
-#include "debug.hh"
-#include "midi-def.hh"
+#include "warn.hh"
 #include "audio-column.hh"
 #include "audio-item.hh"
-#include "midi-item.hh"
-#include "midi-stream.hh"
-#include "string.hh"
-#include "string-convert.hh"
-
-
-IMPLEMENT_IS_TYPE_B1(Staff_performer,Performer_group_performer);
-ADD_THIS_PERFORMER(Staff_performer);
-
-Staff_performer::Staff_performer()
+#include "audio-staff.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
 {
-    midi_track_p_ = new Midi_track;
+public:
+  TRANSLATOR_DECLARATIONS (Staff_performer);
+  ~Staff_performer ();
+
+  string new_instrument_string ();
+  string instrument_string_;
+
+protected:
+  virtual void acknowledge_audio_element (Audio_element_info info);
+  virtual void finalize ();
+  virtual void initialize ();
+  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_;
+};
+
+#include "translator.icc"
+
+ADD_TRANSLATOR (Staff_performer, "", "",
+		"", "");
+
+Staff_performer::Staff_performer ()
+{
+  audio_staff_ = 0;
+  instrument_ = 0;
+  instrument_name_ = 0;
+  name_ = 0;
+  tempo_ = 0;
 }
 
-Staff_performer::~Staff_performer()
+Staff_performer::~Staff_performer ()
 {
-    delete midi_track_p_;
 }
 
 void
-Staff_performer::do_creation_processing()
+Staff_performer::initialize ()
 {
+  audio_staff_ = new Audio_staff;
+  name_ = new Audio_text (Audio_text::TRACK_NAME, context ()->id_string ());
+
+  audio_staff_->add_audio_item (name_);
+  
+  announce_element (Audio_element_info (audio_staff_, 0));
+  announce_element (Audio_element_info (name_, 0));
 }
 
 void
-Staff_performer::do_removal_processing()
+Staff_performer::process_music ()
 {
-    header();
-
-    Moment midi_mom = 0;
-    for ( PCursor<Audio_item*> i( audio_item_p_list_ ); i.ok(); i++ ) {
-	Audio_item* l = *i;
-	Moment mom = l->audio_column_l_->at_mom();
-	Moment delta_t = mom - midi_mom_ ;
-	midi_mom_ += delta_t;
-	Midi_item* p = l->midi_item_p();
-	p->channel_i_ = track_i_;
-	midi_track_p_->add( delta_t, p );
-	delete p;
+  string str = new_instrument_string ();
+  if (str.length ())
+    {
+      instrument_name_ = new Audio_text (Audio_text::INSTRUMENT_NAME, str);
+      announce_element (Audio_element_info (instrument_name_, 0));
+      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.
+      */
     }
-
-    Performer::play( midi_track_p_ );
 }
 
 void
-Staff_performer::header()
+Staff_performer::stop_translation_timestep ()
 {
-    // set track name
-    Midi_text track_name( Midi_text::TRACK_NAME, instrument_str() );
-    midi_track_p_->add( Moment( 0 ), &track_name );
-
-    // set instrument description
-    Midi_text instrument_name( Midi_text::INSTRUMENT_NAME, instrument_str() );
-    midi_track_p_->add( Moment( 0 ), &instrument_name );
-
-    // set instrument :-)
-    // lieve wendy, nu heb je mijn track_i_ / get_staff_i weggehaald...
-    // zie ook note-performer: ugh
-    // ugh, need to know channel (===track===staff) too
-    int channel_i = track_i_;
-    Midi_instrument instrument( channel_i, instrument_str() );
-    midi_track_p_->add( Moment( 0 ), &instrument );
-
-    Midi_tempo midi_tempo( get_tempo_i() );
-    midi_track_p_->add( Moment( 0 ), &midi_tempo );
-}
+  SCM proc = ly_lily_module_constant ("percussion?");
 
-String 
-Staff_performer::instrument_str() 
-{ 
-    return Translator::id_str_; 
+  SCM drums = scm_call_1 (proc, ly_symbol2scm (instrument_string_.c_str ()));
+  audio_staff_->channel_ = (drums == SCM_BOOL_T ? 9 : -1);
+  if (name_)
+    {
+      name_ = 0;
+    }
+  if (tempo_)
+    {
+      tempo_ = 0;
+    }
+  instrument_name_ = 0;
+  instrument_ = 0;
 }
 
-void 
-Staff_performer::play( Audio_item* p )
+void
+Staff_performer::finalize ()
 {
-    audio_item_p_list_.bottom().add( p );
-    Performer::play( p );
+  audio_staff_ = 0;
 }
 
-// huh?
-void 
-Staff_performer::play( Midi_item* p )
+string
+Staff_performer::new_instrument_string ()
 {
-    Performer::play( p );
-}
+  // mustn't ask Score for instrument: it will return piano!
+  SCM minstr = get_property ("midiInstrument");
 
+  if (!scm_is_string (minstr)
+      || ly_scm2string (minstr) == instrument_string_)
+    return "";
 
-//<ugh>
-int
-Staff_performer::get_track_i() const
-{
-    return track_i_;
+  instrument_string_ = ly_scm2string (minstr);
+
+  return instrument_string_;
 }
 
 void
-Staff_performer::set_track( int& track_i_r )
+Staff_performer::acknowledge_audio_element (Audio_element_info inf)
 {
-    track_i_ = track_i_r++;
+  if (Audio_item *ai = dynamic_cast<Audio_item *> (inf.elem_))
+    audio_staff_->add_audio_item (ai);
 }
-//</ugh>