X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-info.cc;h=ee79e4ec661aebbc5414d4794dc5b8c804385336;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=2103385880d800267afb5a4846ef395eaeb86d5f;hpb=058370efc7e9710f149d0f444328bb1fcd7bdec1;p=lilypond.git diff --git a/lily/grob-info.cc b/lily/grob-info.cc index 2103385880..ee79e4ec66 100644 --- a/lily/grob-info.cc +++ b/lily/grob-info.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2014 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ Stream_event * Grob_info::event_cause () const { SCM cause = grob_->get_property ("cause"); - return unsmob_stream_event (cause); + return Stream_event::unsmob (cause); } vector @@ -90,11 +90,11 @@ Stream_event * Grob_info::ultimate_event_cause () const { SCM cause = grob_->self_scm (); - while (unsmob_grob (cause)) + while (Grob::is_smob (cause)) { - cause = unsmob_grob (cause)->get_property ("cause"); + cause = Grob::unsmob (cause)->get_property ("cause"); } - return unsmob_stream_event (cause); + return Stream_event::unsmob (cause); } bool