X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-iterator.cc;h=d95ea1ae3c3920e5c3c1ed45a14df618a9e38fbc;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=3de2ba5ba30226c124403c74f0a9179ab07cebd7;hpb=e58fce49b3113408254011774685370b8233df17;p=lilypond.git

diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc
index 3de2ba5ba3..d95ea1ae3c 100644
--- a/lily/chord-tremolo-iterator.cc
+++ b/lily/chord-tremolo-iterator.cc
@@ -1,101 +1,36 @@
-/*   
-  chord-tremolo-iterator.cc --  implement Chord_tremolo_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2003 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_ = unsmob_iterator (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;
-}
+  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.
 
-Chord_tremolo_iterator::Chord_tremolo_iterator (Chord_tremolo_iterator const &src)
-  : Music_iterator (src)
-{
-  factor_ = src.factor_;
-  child_iter_ = 0;
-  if (src.child_iter_)
-    {
-      child_iter_ = src.child_iter_->clone ();
-      scm_gc_unprotect_object (child_iter_->self_scm());
-    }
-}
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-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 (Translator_group*f, Translator_group*t) 
-{
-  if (child_iter_)
-    child_iter_->substitute_outlet (f,t);
-}
-
-void
-Chord_tremolo_iterator::process (Moment m)
-{
-  if (!m.to_bool () )
-    {
-      Music_iterator *yeah = try_music (get_music ());
-      if (yeah)
-	set_translator (yeah->get_outlet ());
-      else
-	get_music ()->origin ()->warning (_ ("no one to print a tremolos"));
-    }
-
-  child_iter_->process (factor_ * m);
-}
+#include "chord-tremolo-iterator.hh"
 
-Moment
-Chord_tremolo_iterator::pending_moment () const
-{
-  return child_iter_->pending_moment () / factor_;
-}
+#include "repeated-music.hh"
+#include "lily-imports.hh"
 
-bool
-Chord_tremolo_iterator::ok () const
+Chord_tremolo_iterator::Chord_tremolo_iterator ()
 {
-  return child_iter_ && child_iter_->ok ();
 }
 
-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);
+  return Lily::tremolo_get_music_list (get_music ()->self_scm ());
 }
 
 IMPLEMENT_CTOR_CALLBACK (Chord_tremolo_iterator);
-