(c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
*/
-#include "translator-group.hh"
#include "warn.hh"
#include "audio-column.hh"
#include "audio-item.hh"
#include "audio-staff.hh"
#include "performer-group-performer.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
{
public:
- TRANSLATOR_DECLARATIONS(Staff_performer);
+ TRANSLATOR_DECLARATIONS (Staff_performer);
~Staff_performer ();
String new_instrument_string ();
Audio_tempo* tempo_;
};
-ENTER_DESCRIPTION (Staff_performer, "", "",
+ADD_TRANSLATOR (Staff_performer, "", "",
"",
"", "", "");
audio_staff_ = new Audio_staff;
announce_element (Audio_element_info (audio_staff_, 0));
- name_ = new Audio_text (Audio_text::TRACK_NAME, id_string_);
+ 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 (instrument_name_, 0));
instrument_ = new Audio_instrument (str);
announce_element (Audio_element_info (instrument_, 0));
+
+ /*
+ 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 ()
{
- /*
- UGH. -> don't use eval.
- */
- static SCM proc;
- if (!proc)
- proc = scm_primitive_eval (ly_symbol2scm ("percussion?"));
+ SCM proc = ly_lily_module_constant ("percussion?");
- SCM drums = gh_call1 (proc, ly_symbol2scm (instrument_string_.to_str0 ()));
+ SCM drums = scm_call_1 (proc, ly_symbol2scm (instrument_string_.to_str0 ()));
audio_staff_->channel_ = (drums == SCM_BOOL_T ? 9 : -1 );
if (name_)
{
play_element (tempo_);
tempo_ = 0;
}
- if (instrument_name_)
- {
- play_element (instrument_name_);
- instrument_name_ = 0;
- }
- if (instrument_)
- {
- play_element (instrument_);
- instrument_ = 0;
- }
+ instrument_name_ = 0;
+ instrument_ = 0;
Performer_group_performer::stop_translation_timestep ();
}
// mustn't ask Score for instrument: it will return piano!
SCM minstr = get_property ("midiInstrument");
- if (!gh_string_p (minstr)
+ if (!scm_is_string (minstr)
|| ly_scm2string (minstr) == instrument_string_)
return "";