/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1996--2014 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 1996--2015 Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
void stop_translation_timestep ();
void process_music ();
- DECLARE_TRANSLATOR_LISTENER (note);
- DECLARE_TRANSLATOR_LISTENER (breathing);
+ void listen_note (Stream_event *);
+ void listen_breathing (Stream_event *);
+ void listen_tie (Stream_event *);
+ void listen_articulation (Stream_event *);
private:
- vector<Stream_event *> note_evs_;
+ vector<Stream_event *> note_evs_, script_evs_;
vector<Audio_note *> notes_;
vector<Audio_note *> last_notes_;
Moment last_start_;
-
};
void
Pitch transposing;
SCM prop = get_property ("instrumentTransposition");
- if (unsmob_pitch (prop))
- transposing = *unsmob_pitch (prop);
+ if (unsmob<Pitch> (prop))
+ transposing = *unsmob<Pitch> (prop);
for (vsize i = 0; i < note_evs_.size (); i++)
{
Stream_event *n = note_evs_[i];
SCM pit = n->get_property ("pitch");
- if (Pitch *pitp = unsmob_pitch (pit))
+ if (Pitch *pitp = unsmob<Pitch> (pit))
{
SCM articulations = n->get_property ("articulations");
Stream_event *tie_event = 0;
Moment len = get_event_length (n, now_mom ());
int velocity = 0;
+
+ for (vsize j = script_evs_.size (); j--;)
+ articulations = scm_cons (script_evs_[j]->self_scm (), articulations);
+
for (SCM s = articulations; scm_is_pair (s); s = scm_cdr (s))
{
- Stream_event *ev = unsmob_stream_event (scm_car (s));
+ Stream_event *ev = unsmob<Stream_event> (scm_car (s));
if (!ev)
continue;
notes_.clear ();
note_evs_.clear ();
+ script_evs_.clear ();
}
-IMPLEMENT_TRANSLATOR_LISTENER (Note_performer, note)
void
Note_performer::listen_note (Stream_event *ev)
{
note_evs_.push_back (ev);
}
-IMPLEMENT_TRANSLATOR_LISTENER (Note_performer, breathing)
+void
+Note_performer::listen_tie (Stream_event *ev)
+{
+ script_evs_.push_back (ev);
+}
+
+void
+Note_performer::listen_articulation (Stream_event *ev)
+{
+ script_evs_.push_back (ev);
+}
+
void
Note_performer::listen_breathing (Stream_event *ev)
{
if (ly_is_procedure (f))
for (vsize i = 0; i < last_notes_.size (); i++)
{
- Audio_note *tie_head = last_notes_[i]->tie_head ();
- //Give midi-length the available time since the note started,
- //including rests. It returns how much is left for the note.
- Moment available = now_mom () - tie_head->audio_column_->when ();
+ //Pass midi-length the available time since the last note started,
+ //including any intervening rests. It returns how much is left for the
+ //note.
+ Moment start = last_notes_[i]->audio_column_->when ();
+ Moment available = now_mom () - start;
Moment len = robust_scm2moment (scm_call_2 (f, available.smobbed_copy (),
context ()->self_scm ()), available);
+ //Take time from the first note of the tie, since it has all the length.
+ Audio_note *tie_head = last_notes_[i]->tie_head ();
+ len += start - tie_head->audio_column_->when ();
if (len < tie_head->length_mom_)
tie_head->length_mom_ = len;
}
}
+void
+Note_performer::boot ()
+{
+ ADD_LISTENER (Note_performer, note);
+ ADD_LISTENER (Note_performer, breathing);
+ ADD_LISTENER (Note_performer, tie);
+ ADD_LISTENER (Note_performer, articulation);
+}
+
ADD_TRANSLATOR (Note_performer,
/* doc */
"",
""
);
-Note_performer::Note_performer ()
+Note_performer::Note_performer (Context *c)
+ : Performer (c)
{
}