X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-iterator.cc;h=601f7bccb08df7d22a0f5a0ed4f2bd2cf0c85a90;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=7cec33c3026daaa5d33fbb5b0fd942e1a9291988;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git

diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc
index 7cec33c302..601f7bccb0 100644
--- a/lily/chord-tremolo-iterator.cc
+++ b/lily/chord-tremolo-iterator.cc
@@ -1,82 +1,37 @@
-/*   
-  chord-tremolo-iterator.cc --  implement Chord_tremolo_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-
 /*
-  this is culled from various other iterators, but sharing code by
-  subclassing proved to be too difficult.
- */
+  This file is part of LilyPond, the GNU music typesetter.
 
-#include "input.hh"
-#include "chord-tremolo-iterator.hh"
-#include "repeated-music.hh"
+  Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+                 Erik Sandberg <mandolaerik@gmail.com>
 
-void
-Chord_tremolo_iterator::construct_children ()
-{
-  Repeated_music * rep = dynamic_cast<Repeated_music*> (get_music ());
-  factor_  = Moment (Rational(1, 1));
-  child_iter_ = get_iterator (rep->body ());
-}
+  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.
 
-Chord_tremolo_iterator::Chord_tremolo_iterator ()
-{
-  factor_ = 1;
-  child_iter_ = 0;
-}
-
-Chord_tremolo_iterator::Chord_tremolo_iterator (Chord_tremolo_iterator const &src)
-  : Music_iterator (src)
-{
-  factor_ = src.factor_;
-  child_iter_ = src.child_iter_ ? src.child_iter_->clone () : 0; 
-}
+  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.
 
-void
-Chord_tremolo_iterator::process (Moment m)
-{
-  if (!m.to_bool () )
-    {
-      Music_iterator *yeah = try_music (get_music ());
-      if (yeah)
-	set_translator (yeah->report_to ());
-      else
-	get_music ()->origin ()->warning (_ ("no one to print a tremolos"));
-    }
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-  child_iter_->process (factor_ * m);
-}
-
-Moment
-Chord_tremolo_iterator::pending_moment () const
-{
-  return child_iter_->pending_moment () / factor_;
-}
+#include "chord-tremolo-iterator.hh"
 
-bool
-Chord_tremolo_iterator::ok () const
-{
-  return child_iter_ && child_iter_->ok ();
-}
+#include "repeated-music.hh"
 
-Chord_tremolo_iterator::~Chord_tremolo_iterator ()
+Chord_tremolo_iterator::Chord_tremolo_iterator ()
 {
-  delete child_iter_;
 }
 
-Music_iterator*
-Chord_tremolo_iterator::try_music_in_children (Music  *m) const
+SCM
+Chord_tremolo_iterator::get_music_list () 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);
-