Release: bump Welcome versions.

[lilypond.git] / lily / repeated-music.cc

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index 666b1fbf1dee6bccb2976ddd4c48e73e13ff23a1..001eb0e5e40b183edf56e1ea21bab24b0fd01f84 100644 (file)
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -1,9 +1,20 @@
 /*
-  repeated-music.cc -- implement Repeated_music
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  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 "repeated-music.hh"
@@ -15,7 +26,7 @@
 Music *
 Repeated_music::body (Music *me)
 {
-  return unsmob_music (me->get_property ("element"));
+  return unsmob<Music> (me->get_property ("element"));
 }
 
 SCM
@@ -24,33 +35,6 @@ Repeated_music::alternatives (Music *me)
   return me->get_property ("elements");
 }
 
-MAKE_SCHEME_CALLBACK (Repeated_music, relative_callback, 2);
-SCM
-Repeated_music::relative_callback (SCM music, SCM pitch)
-{
-  Pitch p = *unsmob_pitch (pitch);
-  Music *me = unsmob_music (music);
-  if (lily_1_8_relative)
-    {
-      Music *body = unsmob_music (me->get_property ("element"));
-      if (body)
-       p = body->to_relative_octave (p);
-
-      Pitch last = p;
-      SCM alternatives = me->get_property ("elements");
-
-      for (SCM s = alternatives; scm_is_pair (s); s = scm_cdr (s))
-       {
-         lily_1_8_compatibility_used = true;
-         unsmob_music (scm_car (s))->to_relative_octave (p);
-       }
-
-      return last.smobbed_copy ();
-    }
-  else
-    return me->generic_to_relative_octave (p).smobbed_copy ();
-}
-
 Moment
 Repeated_music::alternatives_get_length (Music *me, bool fold)
 {
@@ -69,10 +53,10 @@ Repeated_music::alternatives_get_length (Music *me, bool fold)
   SCM p = alternative_list;
   while (scm_is_pair (p) && done < count)
     {
-      m = m + unsmob_music (scm_car (p))->get_length ();
+      m = m + unsmob<Music> (scm_car (p))->get_length ();
       done++;
       if (count - done < len)
-       p = scm_cdr (p);
+        p = scm_cdr (p);
     }
   return m;
 }
@@ -94,7 +78,7 @@ Moment
 Repeated_music::body_get_length (Music *me)
 {
   Moment m = 0;
-  if (Music *body = unsmob_music (me->get_property ("element")))
+  if (Music *body = unsmob<Music> (me->get_property ("element")))
     m = body->get_length ();
   return m;
 }
@@ -104,7 +88,7 @@ MAKE_SCHEME_CALLBACK (Repeated_music, unfolded_music_length, 1);
 SCM
 Repeated_music::unfolded_music_length (SCM m)
 {
-  Music *me = unsmob_music (m);
+  Music *me = unsmob<Music> (m);
 
   Moment l = Moment (repeat_count (me)) * body_get_length (me) + alternatives_get_length (me, false);
   return l.smobbed_copy ();
@@ -114,7 +98,7 @@ MAKE_SCHEME_CALLBACK (Repeated_music, folded_music_length, 1);
 SCM
 Repeated_music::folded_music_length (SCM m)
 {
-  Music *me = unsmob_music (m);
+  Music *me = unsmob<Music> (m);
 
   Moment l = body_get_length (me) + alternatives_get_length (me, true);
   return l.smobbed_copy ();
@@ -130,7 +114,7 @@ MAKE_SCHEME_CALLBACK (Repeated_music, volta_music_length, 1);
 SCM
 Repeated_music::volta_music_length (SCM m)
 {
-  Music *me = unsmob_music (m);
+  Music *me = unsmob<Music> (m);
   Moment l = body_get_length (me) + alternatives_volta_get_length (me);
   return l.smobbed_copy ();
 }
@@ -139,8 +123,8 @@ MAKE_SCHEME_CALLBACK (Repeated_music, minimum_start, 1);
 SCM
 Repeated_music::minimum_start (SCM m)
 {
-  Music *me = unsmob_music (m);
-  Music *body = unsmob_music (me->get_property ("element"));
+  Music *me = unsmob<Music> (m);
+  Music *body = unsmob<Music> (me->get_property ("element"));
 
   if (body)
     return body->start_mom ().smobbed_copy ();
@@ -152,11 +136,11 @@ MAKE_SCHEME_CALLBACK (Repeated_music, first_start, 1);
 SCM
 Repeated_music::first_start (SCM m)
 {
-  Music *me = unsmob_music (m);
-  Music *body = unsmob_music (me->get_property ("element"));
+  Music *me = unsmob<Music> (m);
+  Music *body = unsmob<Music> (me->get_property ("element"));
 
   Moment rv = (body) ? body->start_mom ()
-    : Music_sequence::first_start (me->get_property ("elements"));
+              : Music_sequence::first_start (me->get_property ("elements"));
 
   return rv.smobbed_copy ();
 }