source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+ (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
#include "warn.hh"
#include "audio-column.hh"
#include "audio-item.hh"
#include "audio-staff.hh"
-#include "performer-group-performer.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_group_performer
+ (staff-wide) set, so we override play_element ()
+*/
+class Staff_performer : public Performer
{
public:
TRANSLATOR_DECLARATIONS (Staff_performer);
~Staff_performer ();
- String new_instrument_string ();
- String instrument_string_;
+ string new_instrument_string ();
+ string instrument_string_;
protected:
- virtual void play_element (Audio_element* p);
+ virtual void acknowledge_audio_element (Audio_element_info info);
virtual void finalize ();
virtual void initialize ();
- virtual void create_audio_elements ();
- virtual void stop_translation_timestep ();
+ 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_;
+ 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 ()
{
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 ());
- announce_element (Audio_element_info (tempo_, 0));
- Performer_group_performer::initialize ();
+ audio_staff_->add_audio_item (name_);
+
+ announce_element (Audio_element_info (audio_staff_, 0));
+ announce_element (Audio_element_info (name_, 0));
}
void
-Staff_performer::create_audio_elements ()
+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);
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.
- */
- play_element (instrument_);
- play_element (instrument_name_);
+ */
}
- Performer_group_performer::create_audio_elements ();
}
void
Staff_performer::stop_translation_timestep ()
{
SCM proc = ly_lily_module_constant ("percussion?");
-
- SCM drums = scm_call_1 (proc, ly_symbol2scm (instrument_string_.to_str0 ()));
- audio_staff_->channel_ = (drums == SCM_BOOL_T ? 9 : -1 );
+
+ SCM drums = scm_call_1 (proc, ly_symbol2scm (instrument_string_.c_str ()));
+ audio_staff_->channel_ = (drums == SCM_BOOL_T ? 9 : -1);
if (name_)
{
- play_element (name_);
name_ = 0;
}
if (tempo_)
{
- play_element (tempo_);
tempo_ = 0;
}
instrument_name_ = 0;
instrument_ = 0;
- Performer_group_performer::stop_translation_timestep ();
}
void
Staff_performer::finalize ()
{
- Performer_group_performer::finalize ();
- Performer::play_element (audio_staff_);
audio_staff_ = 0;
}
-String
-Staff_performer::new_instrument_string ()
-{
+string
+Staff_performer::new_instrument_string ()
+{
// mustn't ask Score for instrument: it will return piano!
SCM minstr = get_property ("midiInstrument");
return instrument_string_;
}
-void
-Staff_performer::play_element (Audio_element* p)
+void
+Staff_performer::acknowledge_audio_element (Audio_element_info inf)
{
- if (Audio_item *ai = dynamic_cast<Audio_item *> (p))
- {
- audio_staff_->add_audio_item (ai);
- }
- Performer::play_element (p);
+ if (Audio_item *ai = dynamic_cast<Audio_item *> (inf.elem_))
+ audio_staff_->add_audio_item (ai);
}