X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-performer.cc;h=1ddbb13ca3daf670056457ecd7ce54826cdc5e2c;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=59ac69ac9842c895d9ceb8bd618cf0af4ffb3031;hpb=a32bd8c257007f81271de85862ea8bde6dd9402e;p=lilypond.git diff --git a/lily/note-performer.cc b/lily/note-performer.cc index 59ac69ac98..1ddbb13ca3 100644 --- a/lily/note-performer.cc +++ b/lily/note-performer.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1996--2014 Jan Nieuwenhuizen + Copyright (C) 1996--2015 Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -54,15 +54,15 @@ Note_performer::process_music () Pitch transposing; SCM prop = get_property ("instrumentTransposition"); - if (unsmob_pitch (prop)) - transposing = *unsmob_pitch (prop); + if (Pitch::is_smob (prop)) + transposing = *Pitch::unsmob (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 = Pitch::unsmob (pit)) { SCM articulations = n->get_property ("articulations"); Stream_event *tie_event = 0; @@ -70,7 +70,7 @@ Note_performer::process_music () int velocity = 0; for (SCM s = articulations; scm_is_pair (s); s = scm_cdr (s)) { - Stream_event *ev = unsmob_stream_event (scm_car (s)); + Stream_event *ev = Stream_event::unsmob (scm_car (s)); if (!ev) continue;