X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-music-iterator.cc;h=011d32cd01f1be25cdc9e71d6f7b84ea4fb928ee;hb=f4abbfff5f0d985a457e15586dbcc3ae473b0dee;hp=951c145ec83c65cee469f4cec50c6c1adafab3a5;hpb=ae2db5b21bf232f5145f3a3e091689c8fc7247e9;p=lilypond.git diff --git a/lily/rhythmic-music-iterator.cc b/lily/rhythmic-music-iterator.cc index 951c145ec8..011d32cd01 100644 --- a/lily/rhythmic-music-iterator.cc +++ b/lily/rhythmic-music-iterator.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2012 Mike Solomon + Copyright (C) 2012 Mike Solomon LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -47,7 +47,7 @@ Rhythmic_music_iterator::process (Moment m) descend_to_bottom_context (); Context *c = get_outlet (); - Stream_event *ev = get_music ()->to_event (c); + Stream_event *ev = get_music ()->to_event (); SCM arts = ev->get_property ("articulations"); if (scm_is_pair (arts)) @@ -59,10 +59,10 @@ Rhythmic_music_iterator::process (Moment m) SCM unlistened = SCM_EOL; for (; scm_is_pair (arts); arts = scm_cdr (arts)) { - SCM art = scm_car (arts); + SCM art = scm_car (arts); if (c->event_source ()->is_listened_class - (unsmob_stream_event (art)->get_property ("class"))) + (Stream_event::unsmob (art)->get_property ("class"))) listened = scm_cons (art, listened); else unlistened = scm_cons (art, unlistened); @@ -71,7 +71,7 @@ Rhythmic_music_iterator::process (Moment m) c->event_source ()->broadcast (ev); arts = scm_reverse_x (listened, SCM_EOL); for (; scm_is_pair (arts); arts = scm_cdr (arts)) - c->event_source ()->broadcast (unsmob_stream_event (scm_car (arts))); + c->event_source ()->broadcast (Stream_event::unsmob (scm_car (arts))); } else c->event_source ()->broadcast (ev);