source file of the GNU LilyPond music typesetter
- (c) 1996--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1996--2004 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "performer.hh"
-#include "musical-request.hh"
+#include "event.hh"
#include "audio-item.hh"
#include "audio-column.hh"
#include "global-translator.hh"
#include "warn.hh"
/**
-Convert reqs to audio notes.
+Convert evs to audio notes.
*/
class Note_performer : public Performer {
public:
TRANSLATOR_DECLARATIONS(Note_performer);
protected:
- virtual bool try_music (Music *req) ;
+ virtual bool try_music (Music *ev) ;
virtual void stop_translation_timestep ();
virtual void create_audio_elements ();
Global_translator* get_global_translator ();
private:
- Array<Note_req*> note_reqs_;
- Array<Audio_note*> notes_;
- Array<Audio_note*> delayeds_;
+ Link_array<Music> note_evs_;
+ Link_array<Audio_note> notes_;
+ Link_array<Audio_note> delayeds_;
};
void
Note_performer::create_audio_elements ()
{
- if (note_reqs_.size ())
+ if (note_evs_.size ())
{
int transposing_i = 0;
//urg
if (gh_number_p (prop))
transposing_i = gh_scm2int (prop);
- while (note_reqs_.size ())
+ while (note_evs_.size ())
{
- Note_req* n = note_reqs_.pop ();
- Pitch pit = * unsmob_pitch (n->get_mus_property ("pitch"));
- Audio_note* p = new Audio_note (pit, n->length_mom (), transposing_i);
- Audio_element_info info (p, n);
- announce_element (info);
- notes_.push (p);
+ Music* n = note_evs_.pop ();
+ Pitch *pit = unsmob_pitch (n->get_mus_property ("pitch"));
+
+ if (pit)
+ {
+ Audio_note* p = new Audio_note (*pit, n->get_length (), transposing_i);
+ Audio_element_info info (p, n);
+ announce_element (info);
+ notes_.push (p);
+ }
}
- note_reqs_.clear ();
+ note_evs_.clear ();
}
}
play_element (notes_[i]);
}
notes_.clear ();
- note_reqs_.clear ();
+ note_evs_.clear ();
for (int i=0; i < delayeds_.size (); i++)
{
Audio_note* n = delayeds_[i];
}
bool
-Note_performer::try_music (Music* req)
+Note_performer::try_music (Music* ev)
{
- if (Note_req *nr = dynamic_cast <Note_req *> (req))
+ if (ev->is_mus_type ("note-event"))
{
- note_reqs_.push (nr);
+ note_evs_.push (ev);
return true;
}
+ else if (ev->is_mus_type ("busy-playing-event"))
+ return note_evs_.size ();
+
return false;
}
-ENTER_DESCRIPTION(Note_performer,"","","","","");
+ENTER_DESCRIPTION(Note_performer,"","",
+ "note-event busy-playing-event","","","");
Note_performer::Note_performer()
{