X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-iterator.cc;h=601f7bccb08df7d22a0f5a0ed4f2bd2cf0c85a90;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=b6f1c4f69a63ca8b6447f7864b9d2bc892e208b9;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc index b6f1c4f69a..601f7bccb0 100644 --- a/lily/chord-tremolo-iterator.cc +++ b/lily/chord-tremolo-iterator.cc @@ -1,85 +1,37 @@ /* - chord-tremolo-iterator.cc -- implement Chord_tremolo_iterator + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2000--2015 Han-Wen Nienhuys + Erik Sandberg - (c) 2000--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 "chord-tremolo-iterator.hh" -#include "input.hh" -#include "international.hh" #include "repeated-music.hh" -void -Chord_tremolo_iterator::construct_children () -{ - Music *m = get_music (); - - factor_ = Moment (Rational (1, 1)); - child_iter_ = unsmob_iterator (get_iterator (Repeated_music::body (m))); -} - Chord_tremolo_iterator::Chord_tremolo_iterator () { - factor_ = 1; - child_iter_ = 0; -} - -void -Chord_tremolo_iterator::do_quit () -{ - if (child_iter_) - child_iter_->quit (); -} - -void -Chord_tremolo_iterator::derived_mark () const -{ - if (child_iter_) - scm_gc_mark (child_iter_->self_scm ()); -} - -void -Chord_tremolo_iterator::derived_substitute (Context *f, Context *t) -{ - if (child_iter_) - child_iter_->substitute_outlet (f, t); } -void -Chord_tremolo_iterator::process (Moment m) +SCM +Chord_tremolo_iterator::get_music_list () const { - if (!m.to_bool ()) - { - Music_iterator *yeah = try_music (get_music ()); - if (yeah) - set_context (yeah->get_outlet ()); - else - get_music ()->origin ()->warning (_ ("no one to print a tremolos")); - } - - child_iter_->process (factor_ * m); -} - -Moment -Chord_tremolo_iterator::pending_moment () const -{ - return child_iter_->pending_moment () / factor_; -} - -bool -Chord_tremolo_iterator::ok () const -{ - return child_iter_ && child_iter_->ok (); -} - -Music_iterator * -Chord_tremolo_iterator::try_music_in_children (Music *m) const -{ - return child_iter_->try_music (m); + Music *mus = get_music (); + SCM proc = ly_lily_module_constant ("tremolo::get-music-list"); + return scm_call_1 (proc, mus->self_scm ()); } IMPLEMENT_CTOR_CALLBACK (Chord_tremolo_iterator); -