X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-iterator.cc;h=ae9a17eb4674ae184c5507b7a92e7c9f73e81855;hb=33f2e59ea0b2a1ba41e943b5afa29e5fee97ba94;hp=b4d769696810ee5258887f2396e5df0bab655855;hpb=d765f3af45be51f15da55cf570a4b172200e1035;p=lilypond.git diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc index b4d7696968..ae9a17eb46 100644 --- a/lily/chord-tremolo-iterator.cc +++ b/lily/chord-tremolo-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2002 Han-Wen Nienhuys + (c) 2000--2003 Han-Wen Nienhuys */ @@ -35,9 +35,12 @@ Chord_tremolo_iterator::Chord_tremolo_iterator (Chord_tremolo_iterator const &sr : Music_iterator (src) { factor_ = src.factor_; - child_iter_ = src.child_iter_ ? src.child_iter_->clone () : 0; - if (child_iter_) - scm_gc_unprotect_object (child_iter_->self_scm()); + child_iter_ = 0; + if (src.child_iter_) + { + child_iter_ = src.child_iter_->clone (); + scm_gc_unprotect_object (child_iter_->self_scm()); + } } void @@ -54,6 +57,13 @@ Chord_tremolo_iterator::derived_mark () const scm_gc_mark (child_iter_->self_scm()); } +void +Chord_tremolo_iterator::derived_substitute (Translator_group*f, Translator_group*t) +{ + if (child_iter_) + child_iter_->substitute_outlet (f,t); +} + void Chord_tremolo_iterator::process (Moment m) { @@ -87,7 +97,5 @@ Chord_tremolo_iterator::try_music_in_children (Music *m) const return child_iter_->try_music (m); } - - IMPLEMENT_CTOR_CALLBACK (Chord_tremolo_iterator);