X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-iterator.cc;h=d95ea1ae3c3920e5c3c1ed45a14df618a9e38fbc;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=0f86e33d98a77cd6899a22951ddaf4fc3bf73c19;hpb=287611887cd612ac84dbf10c5fe4e1a44cc56596;p=lilypond.git

diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc
index 0f86e33d98..d95ea1ae3c 100644
--- a/lily/chord-tremolo-iterator.cc
+++ b/lily/chord-tremolo-iterator.cc
@@ -1,72 +1,36 @@
-/*   
-  chord-tremolo-iterator.cc --  implement Chord_tremolo_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000 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*> (music_l_);
-  factor_  = Moment (1, rep->repeats_i_);
-  child_iter_p_ = get_iterator_p (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_p_ = 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)
-    {
-      Music_iterator *yeah = try_music (music_l_);
-      if (yeah)
-	set_translator (yeah->report_to_l ());
-      else
-	music_l_->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_p_->process (factor_ * m);
-}
-
-
-Moment
-Chord_tremolo_iterator::pending_moment () const
-{
-  return child_iter_p_->pending_moment () / factor_;
-}
+#include "chord-tremolo-iterator.hh"
 
-bool
-Chord_tremolo_iterator::ok () const
-{
-  return child_iter_p_ && child_iter_p_->ok();
-}
+#include "repeated-music.hh"
+#include "lily-imports.hh"
 
-Chord_tremolo_iterator::~Chord_tremolo_iterator ()
+Chord_tremolo_iterator::Chord_tremolo_iterator ()
 {
-  delete child_iter_p_;
 }
 
-Music_iterator*
-Chord_tremolo_iterator::try_music_in_children (Music  *m) const
+SCM
+Chord_tremolo_iterator::get_music_list () const
 {
-  return child_iter_p_->try_music (m);
+  return Lily::tremolo_get_music_list (get_music ()->self_scm ());
 }
 
-
+IMPLEMENT_CTOR_CALLBACK (Chord_tremolo_iterator);