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

diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc
index 06a201f937..d95ea1ae3c 100644
--- a/lily/chord-tremolo-iterator.cc
+++ b/lily/chord-tremolo-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
                  Erik Sandberg <mandolaerik@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -20,10 +20,8 @@
 
 #include "chord-tremolo-iterator.hh"
 
-#include "input.hh"
-#include "international.hh"
-#include "misc.hh"
 #include "repeated-music.hh"
+#include "lily-imports.hh"
 
 Chord_tremolo_iterator::Chord_tremolo_iterator ()
 {
@@ -32,40 +30,7 @@ Chord_tremolo_iterator::Chord_tremolo_iterator ()
 SCM
 Chord_tremolo_iterator::get_music_list () const
 {
-  Music *mus = get_music ();
-  Input *origin = mus->origin ();
-  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 (elt_count <= 0)
-    elt_count = 1;
-
-  if (elt_count == 1)
-    {
-      Music *ev = make_music_by_name (ly_symbol2scm ("TremoloEvent"));
-      ev->set_spot (*origin);
-      ev->set_property ("repeat-count", mus->get_property ("repeat-count"));
-      ev->set_property ("tremolo-type", mus->get_property ("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 ("repeat-count", mus->get_property ("repeat-count"));
-      start_event->set_property ("tremolo-type", mus->get_property ("tremolo-type"));
-
-      return scm_list_3 (start_event_scm, body->self_scm (), stop_event_scm);
-    }
+  return Lily::tremolo_get_music_list (get_music ()->self_scm ());
 }
 
 IMPLEMENT_CTOR_CALLBACK (Chord_tremolo_iterator);