Midi_note::Midi_note (Audio_note *a)
{
audio_ = a;
- dynamic_byte_ = 0x7f;
+ dynamic_byte_ = 0x5a;
}
on_ = n;
channel_ = n->channel_;
- // Anybody who hears any difference, or knows how this works?
- // 0 should definitely be avoided, notes stick on some sound cards.
- // 64 is supposed to be neutral
-
- aftertouch_byte_ = 64;
+ // use note_on with velocity=0 instead of note_off
+ aftertouch_byte_ = 0;
}
string
Midi_note_off::to_string () const
{
- Byte status_byte = (char) (0x80 + channel_);
+ Byte status_byte = (char) (0x90 + channel_);
string str = ::to_string ((char)status_byte);
str += ::to_string ((char) (get_semitone_pitch () + Midi_note::c0_pitch_));
finished_ = 0;
current_event_ = 0;
span_ = 0;
- event_drul_[START] = 0;
- event_drul_[STOP] = 0;
+ event_drul_.set (0, 0);
}
IMPLEMENT_TRANSLATOR_LISTENER (Trill_spanner_engraver, trill_span);
void
Trill_spanner_engraver::acknowledge_note_column (Grob_info info)
{
- if (span_) {
- Pointer_group_interface::add_grob (span_,
- ly_symbol2scm ("note-columns"),
- info.grob());
- add_bound_item (span_, info.grob ());
- } else if (finished_) {
- Pointer_group_interface::add_grob (finished_, ly_symbol2scm ("note-columns"),
- info.grob());
- add_bound_item (finished_, info.grob ());
- }
+ if (span_)
+ {
+ Pointer_group_interface::add_grob (span_,
+ ly_symbol2scm ("note-columns"),
+ info.grob());
+ if (!span_->get_bound (LEFT))
+ add_bound_item (span_, info.grob ());
+ }
+ else if (finished_)
+ {
+ Pointer_group_interface::add_grob (finished_, ly_symbol2scm ("note-columns"),
+ info.grob());
+ if (!finished_->get_bound (RIGHT))
+ add_bound_item (finished_, info.grob ());
+ }
}
void
Trill_spanner_engraver::process_music ()
{
- if (event_drul_[STOP])
+ if (span_
+ && (event_drul_[STOP] || event_drul_[START]))
{
- if (!span_)
- event_drul_[STOP]->origin ()->warning (_ ("cannot find start of trill spanner"));
- else
- {
- finished_ = span_;
- announce_end_grob (finished_, SCM_EOL);
- span_ = 0;
- current_event_ = 0;
- }
+ Stream_event *ender = event_drul_[STOP];
+ if (!ender)
+ ender = event_drul_[START];
+ finished_ = span_;
+ announce_end_grob (finished_, ender->self_scm ());
+ span_ = 0;
+ current_event_ = 0;
}
if (event_drul_[START])
{
- if (current_event_)
- event_drul_[START]->origin ()->warning (_ ("already have a trill spanner"));
- else
- {
- current_event_ = event_drul_[START];
- span_ = make_spanner ("TrillSpanner", event_drul_[START]->self_scm ());
- Side_position_interface::set_axis (span_, Y_AXIS);
- event_drul_[START] = 0;
- }
+ current_event_ = event_drul_[START];
+ span_ = make_spanner ("TrillSpanner", event_drul_[START]->self_scm ());
+ Side_position_interface::set_axis (span_, Y_AXIS);
}
}
}
typeset_all ();
- event_drul_[START] = 0;
- event_drul_[STOP] = 0;
+ event_drul_.set (0, 0);
}
void
typeset_all ();
if (span_)
{
- finished_ = span_;
- typeset_all ();
+ Grob *e = unsmob_grob (get_property ("currentCommandColumn"));
+ span_->set_bound (RIGHT, e);
}
}
"TrillSpanner ",
/* read */
- "",
+ "currentCommandColumn "
+ "currentMusicalColumn ",
/* write */
""