X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farticulations.cc;h=e55e7eb8ff0d702cdf1cfa65042aea1dc3eebb15;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=28a81a6cf55e26c22b04584ee6424b8b58aaecaa;hpb=d61cf3bbdb1c6670a127ba3baddf2f04d3e34fd3;p=lilypond.git diff --git a/lily/articulations.cc b/lily/articulations.cc index 28a81a6cf5..e55e7eb8ff 100644 --- a/lily/articulations.cc +++ b/lily/articulations.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2010--2012 Carl Sorensen + Copyright (C) 2010--2015 Carl Sorensen LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,7 +38,6 @@ articulation_list (vector note_events, vector articulation_events, char const *articulation_name) { - vector string_events; SCM articulations = SCM_EOL; vsize j = 0; @@ -57,7 +56,7 @@ articulation_list (vector note_events, for (SCM s = event->get_property ("articulations"); !articulation_event && scm_is_pair (s); s = scm_cdr (s)) { - Stream_event *art = unsmob_stream_event (scm_car (s)); + Stream_event *art = Stream_event::unsmob (scm_car (s)); if (art->in_event_class (articulation_name)) articulation_event = art; @@ -81,5 +80,5 @@ articulation_list (vector note_events, articulations); } - return (scm_reverse (articulations)); + return scm_reverse_x (articulations, SCM_EOL); }