X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-proto-engraver.cc;h=a72bbbc5a921fd8b732e0c7a720734f5c11bfd74;hb=6847983a10f40946dfd25e97c0bedbdc8b9de2be;hp=ccd3225ec182203097cc879c1ee692f8c8a57fb6;hpb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;p=lilypond.git diff --git a/lily/slur-proto-engraver.cc b/lily/slur-proto-engraver.cc index ccd3225ec1..a72bbbc5a9 100644 --- a/lily/slur-proto-engraver.cc +++ b/lily/slur-proto-engraver.cc @@ -125,7 +125,7 @@ Slur_proto_engraver::finalize () void Slur_proto_engraver::create_slur (const string &spanner_id, Stream_event *ev_cause, Grob *g_cause, Direction dir, bool left_broken) { - Grob *ccc = unsmob_grob (get_property ("currentCommandColumn")); + Grob *ccc = Grob::unsmob (get_property ("currentCommandColumn")); SCM cause = ev_cause ? ev_cause->self_scm () : g_cause->self_scm (); Spanner *slur = make_spanner (grob_name_, cause); slur->set_property ("spanner-id", ly_string2scm (spanner_id)); @@ -176,7 +176,7 @@ Slur_proto_engraver::can_create_slur (const string &id, vsize old_slurs, vsize * if (!updown) return false; - Stream_event *c = unsmob_stream_event (slur->get_property ("cause")); + Stream_event *c = Stream_event::unsmob (slur->get_property ("cause")); if (!c) { @@ -266,7 +266,7 @@ Slur_proto_engraver::set_melisma (bool) void Slur_proto_engraver::stop_translation_timestep () { - if (Grob *g = unsmob_grob (get_property ("currentCommandColumn"))) + if (Grob *g = Grob::unsmob (get_property ("currentCommandColumn"))) { for (vsize i = 0; i < end_slurs_.size (); i++) Slur::add_extra_encompass (end_slurs_[i], g); @@ -280,7 +280,7 @@ Slur_proto_engraver::stop_translation_timestep () { Spanner *s = dynamic_cast (end_slurs_[i]); if (!s->get_bound (RIGHT)) - s->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn"))); + s->set_bound (RIGHT, Grob::unsmob (get_property ("currentMusicalColumn"))); announce_end_grob (s, SCM_EOL); }