X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fevent-chord-iterator.cc;h=0eea36763f3b0fd527dbf29eacd91ed77aa43760;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=89a0f383a99020427b918e09f8675663b9f7f087;hpb=abbdb46061be5c0a0682059d1f86bf3e44ca5cf3;p=lilypond.git diff --git a/lily/event-chord-iterator.cc b/lily/event-chord-iterator.cc index 89a0f383a9..0eea36763f 100644 --- a/lily/event-chord-iterator.cc +++ b/lily/event-chord-iterator.cc @@ -1,9 +1,20 @@ /* - event-chord-iterator.cc -- implement Event_chord_iterator + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2015 Han-Wen Nienhuys - (c) 1997--2006 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "event-chord-iterator.hh" @@ -14,8 +25,6 @@ #include "input.hh" #include "international.hh" #include "music.hh" -#include "pitch.hh" -#include "stream-event.hh" #include "warn.hh" Event_chord_iterator::Event_chord_iterator () @@ -35,17 +44,17 @@ Event_chord_iterator::process (Moment m) if (last_processed_mom_ < Moment (0)) { for (SCM s = get_music ()->get_property ("elements"); - scm_is_pair (s); s = scm_cdr (s)) - { - Music *mus = unsmob_music (scm_car (s)); - report_event (mus); - } - for (SCM s = get_music ()->get_property ("events"); - scm_is_pair (s); s = scm_cdr (s)) - { - Stream_event *ev = unsmob_stream_event (scm_car (s)); - get_outlet ()->event_source ()->broadcast (ev); - } + scm_is_pair (s); s = scm_cdr (s)) + { + Music *mus = Music::unsmob (scm_car (s)); + report_event (mus); + } + for (SCM s = get_music ()->get_property ("articulations"); + scm_is_pair (s); s = scm_cdr (s)) + { + Music *mus = Music::unsmob (scm_car (s)); + report_event (mus); + } } Simple_music_iterator::process (m); }