X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-iterator.cc;h=d95ea1ae3c3920e5c3c1ed45a14df618a9e38fbc;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=1ed8508ca51d724614d32e98809b2026323f8169;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc
index 1ed8508ca5..d95ea1ae3c 100644
--- a/lily/chord-tremolo-iterator.cc
+++ b/lily/chord-tremolo-iterator.cc
@@ -1,84 +1,36 @@
 /*
-  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 <hanwen@xs4all.nl>
+                 Erik Sandberg <mandolaerik@gmail.com>
 
-  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  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 <http://www.gnu.org/licenses/>.
 */
 
 #include "chord-tremolo-iterator.hh"
 
-#include "input.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)));
-}
+#include "lily-imports.hh"
 
 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);
+  return Lily::tremolo_get_music_list (get_music ()->self_scm ());
 }
 
 IMPLEMENT_CTOR_CALLBACK (Chord_tremolo_iterator);
-