release: 1.1.43

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

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 0d94d87ae758b5247f2816e08ee5b2396ac9e287..6628fbeca0b52d482e18c454bbbf532992ccbd20 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -1,96 +1,106 @@
 /*
   staff-performer.cc -- implement Staff_performer
 
-  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  source file of the GNU LilyPond music typesetter
 
+  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+ */
 
 #include "staff-performer.hh"
-#include "translator.hh"
-#include "input-translator.hh"
+#include "translator-group.hh"
 #include "debug.hh"
-#include "midi-def.hh"
-#include "midi-item.hh"
-#include "midi-stream.hh"
-#include "string.hh"
-#include "string-convert.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);
+ADD_THIS_TRANSLATOR (Staff_performer);
 
-Staff_performer::Staff_performer()
+Staff_performer::Staff_performer ()
 {
-    midi_mom_ = 0;
-    midi_track_p_ = new Midi_track;
+  audio_staff_p_ = 0;
 }
-void
-Staff_performer::do_creation_processing()
+
+Staff_performer::~Staff_performer ()
 {
-    header();
+  delete audio_staff_p_;
 }
 
 void
-Staff_performer::do_removal_processing()
+Staff_performer::do_creation_processing ()
 {
-    Performer::play_event( midi_track_p_);
+  audio_staff_p_ = new Audio_staff;
+
+  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
+
+  // tempo
+  play (new Audio_tempo (get_tempo_i ()));
+
+#if 1
+  if (str.length_i ())
+    // instrument
+    play (new Audio_instrument (str));
+#endif
+   
+  Performer_group_performer::do_creation_processing ();
 }
 
-Staff_performer::~Staff_performer()
+void
+Staff_performer::do_process_requests ()
 {
-    delete midi_track_p_;
+  String str = new_instrument_str ();
+  if (str.length_i ())
+    {
+      play (new Audio_text (Audio_text::INSTRUMENT_NAME, str));
+      play (new Audio_instrument (str));
+    }
+  Performer_group_performer::do_process_requests ();
 }
 
+
 void
-Staff_performer::header()
+Staff_performer::do_removal_processing ()
 {
-    // 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 );
+  Performer_group_performer::do_removal_processing ();
+  Performer::play (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!
+  String str = get_property ("midiInstrument", 0);
+  if (!str.length_i ())
+    str = get_property ("instrument", 0);
+  if (str == instrument_str_)
+    return "";
+
+  instrument_str_ = str;
+
+  return instrument_str_;
+
+/* ugh, but can 't
+  if (properties_dict_.elem_b ("instrument"))
+    return properties_dict_["instrument"];
+  return "";
+*/
 }
 
 void 
-Staff_performer::play_event( Midi_item* l )
-{
-    Moment mom = get_mom();
-    Moment delta_t = mom - midi_mom_ ;
-    midi_mom_ += delta_t;
-    midi_track_p_->add( delta_t, l);
-}
-
-
-//<ugh>
-int
-Staff_performer::get_track_i() const
-{
-    return track_i_;
-}
-
-void
-Staff_performer::set_track( int& track_i_r )
+Staff_performer::play (Audio_element* p)
 {
-    track_i_ = track_i_r++;
+  if (Audio_item *ai = dynamic_cast<Audio_item *> (p)) 
+    {
+      audio_staff_p_->add_audio_item (ai);
+    }
+  Performer::play (p);
 }
-//</ugh>