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

diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc
index 1a785b9c4d..601f7bccb0 100644
--- a/lily/chord-tremolo-iterator.cc
+++ b/lily/chord-tremolo-iterator.cc
@@ -1,17 +1,25 @@
 /*
-  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>
-  		 Erik Sandberg <mandolaerik@gmail.com>
+  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 "international.hh"
-#include "misc.hh"
 #include "repeated-music.hh"
 
 Chord_tremolo_iterator::Chord_tremolo_iterator ()
@@ -22,50 +30,8 @@ SCM
 Chord_tremolo_iterator::get_music_list () const
 {
   Music *mus = get_music ();
-  Input *origin = mus->origin ();
-  Moment l = mus->get_length ();
-  Music *body = Repeated_music::body (mus);
-  bool body_is_sequential = body->is_mus_type ("sequential-music");
-
-  int elt_count = body_is_sequential ? scm_ilength (body->get_property ("elements")) : 1;
-
-  if (body_is_sequential &&
-      (elt_count != 2
-       && elt_count != 1))
-    mus->origin ()->warning (_f ("expect 2 elements for chord tremolo, found %d", elt_count));
-
-  if (elt_count <= 0)
-    elt_count = 1;
-      
-  Rational total_dur = l.main_part_;
-  Rational note_dur = total_dur / Rational (elt_count * Repeated_music::repeat_count (mus));
-
-  SCM tremolo_type = scm_int2num (note_dur.den ());
-  int expected_beaming_ = max (0, (intlog2 (total_dur.den ()) - 2));
-
-  if (elt_count == 1)
-    {
-      Music *ev = make_music_by_name (ly_symbol2scm ("TremoloEvent"));
-      ev->set_spot (*origin);
-      ev->set_property ("tremolo-type", tremolo_type);
-      return scm_list_2 (ev->unprotect (), body->self_scm ());
-    }
-  else
-    { 
-      SCM tremolo_symbol = ly_symbol2scm ("TremoloSpanEvent");
-      SCM start_event_scm = scm_call_2 (ly_lily_module_constant ("make-span-event"), tremolo_symbol, scm_from_int (START));
-      unsmob_music (start_event_scm)->set_spot (*origin);
-      SCM stop_event_scm = scm_call_2 (ly_lily_module_constant ("make-span-event"), tremolo_symbol, scm_from_int (STOP));
-
-      Music *start_event = unsmob_music (start_event_scm);
-      Music *stop_event = unsmob_music (stop_event_scm);
-      start_event->set_spot (*origin);
-      stop_event->set_spot (*origin);
-      start_event->set_property ("tremolo-type", tremolo_type);
-      start_event->set_property ("expected-beam-count", scm_int2num (expected_beaming_));
-
-      return scm_list_3 (start_event_scm, body->self_scm (), stop_event_scm);
-    }
+  SCM proc = ly_lily_module_constant ("tremolo::get-music-list");
+  return scm_call_1 (proc, mus->self_scm ());
 }
 
 IMPLEMENT_CTOR_CALLBACK (Chord_tremolo_iterator);