source file of the GNU LilyPond music typesetter
- (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1996--2009 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "performer.hh"
#include "audio-item.hh"
#include "audio-column.hh"
#include "global-context.hh"
+#include "stream-event.hh"
+#include "translator.icc"
#include "warn.hh"
-#include "pitch.hh"
-#include "music.hh"
class Drum_note_performer : public Performer
{
TRANSLATOR_DECLARATIONS (Drum_note_performer);
protected:
- virtual bool try_music (Music *ev);
void stop_translation_timestep ();
void process_music ();
-
+ DECLARE_TRANSLATOR_LISTENER (note);
private:
- Link_array<Music> note_evs_;
- Link_array<Audio_note> notes_;
+ vector<Stream_event*> note_evs_;
+ vector<Audio_note*> notes_;
};
Drum_note_performer::Drum_note_performer ()
while (note_evs_.size ())
{
- Music *n = note_evs_.pop ();
+ Stream_event *n = note_evs_.back ();
+ note_evs_.pop_back ();
SCM sym = n->get_property ("drum-type");
SCM defn = SCM_EOL;
if (Pitch *pit = unsmob_pitch (defn))
{
- Audio_note *p = new Audio_note (*pit, n->get_length (), 0);
+ SCM articulations = n->get_property ("articulations");
+ Stream_event *tie_event = 0;
+ for (SCM s = articulations;
+ !tie_event && scm_is_pair (s);
+ s = scm_cdr (s))
+ {
+ Stream_event *ev = unsmob_stream_event (scm_car (s));
+ if (!ev)
+ continue;
+
+ if (ev->in_event_class ("tie-event"))
+ tie_event = ev;
+ }
+
+ Moment len = get_event_length (n, now_mom ());
+
+ Audio_note *p = new Audio_note (*pit, len,
+ tie_event, Pitch (0, 0, 0));
Audio_element_info info (p, n);
announce_element (info);
- notes_.push (p);
+ notes_.push_back (p);
}
}
void
Drum_note_performer::stop_translation_timestep ()
{
- // why don't grace notes show up here?
- // --> grace notes effectively do not get delayed
- Moment now = now_mom ();
- for (int i = 0; i < notes_.size (); i++)
- play_element (notes_[i]);
notes_.clear ();
note_evs_.clear ();
}
-bool
-Drum_note_performer::try_music (Music *ev)
+IMPLEMENT_TRANSLATOR_LISTENER (Drum_note_performer, note);
+void
+Drum_note_performer::listen_note (Stream_event *ev)
{
- if (ev->is_mus_type ("note-event"))
- {
- note_evs_.push (ev);
- return true;
- }
- else if (ev->is_mus_type ("busy-playing-event"))
- return note_evs_.size ();
-
- return false;
+ note_evs_.push_back (ev);
}
-#include "translator.icc"
-
ADD_TRANSLATOR (Drum_note_performer,
- "Play drum notes.", "",
- "note-event busy-playing-event", "", "");
+ /* doc */
+ "Play drum notes.",
+
+ /* create */
+ "",
+
+ /* read */
+ "",
+
+ /* write */
+ ""
+ );