X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeated-music.cc;h=001eb0e5e40b183edf56e1ea21bab24b0fd01f84;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=b56c61c64847877d87c29409d96fad3995bb4d58;hpb=9066eeede909ace56324c905217c5b585ba42f90;p=lilypond.git

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index b56c61c648..001eb0e5e4 100644
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2015 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
@@ -26,7 +26,7 @@
 Music *
 Repeated_music::body (Music *me)
 {
-  return Music::unsmob (me->get_property ("element"));
+  return unsmob<Music> (me->get_property ("element"));
 }
 
 SCM
@@ -53,7 +53,7 @@ Repeated_music::alternatives_get_length (Music *me, bool fold)
   SCM p = alternative_list;
   while (scm_is_pair (p) && done < count)
     {
-      m = m + Music::unsmob (scm_car (p))->get_length ();
+      m = m + unsmob<Music> (scm_car (p))->get_length ();
       done++;
       if (count - done < len)
         p = scm_cdr (p);
@@ -78,7 +78,7 @@ Moment
 Repeated_music::body_get_length (Music *me)
 {
   Moment m = 0;
-  if (Music *body = Music::unsmob (me->get_property ("element")))
+  if (Music *body = unsmob<Music> (me->get_property ("element")))
     m = body->get_length ();
   return m;
 }
@@ -88,7 +88,7 @@ MAKE_SCHEME_CALLBACK (Repeated_music, unfolded_music_length, 1);
 SCM
 Repeated_music::unfolded_music_length (SCM m)
 {
-  Music *me = Music::unsmob (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 ();
@@ -98,7 +98,7 @@ MAKE_SCHEME_CALLBACK (Repeated_music, folded_music_length, 1);
 SCM
 Repeated_music::folded_music_length (SCM m)
 {
-  Music *me = Music::unsmob (m);
+  Music *me = unsmob<Music> (m);
 
   Moment l = body_get_length (me) + alternatives_get_length (me, true);
   return l.smobbed_copy ();
@@ -114,7 +114,7 @@ MAKE_SCHEME_CALLBACK (Repeated_music, volta_music_length, 1);
 SCM
 Repeated_music::volta_music_length (SCM m)
 {
-  Music *me = Music::unsmob (m);
+  Music *me = unsmob<Music> (m);
   Moment l = body_get_length (me) + alternatives_volta_get_length (me);
   return l.smobbed_copy ();
 }
@@ -123,8 +123,8 @@ MAKE_SCHEME_CALLBACK (Repeated_music, minimum_start, 1);
 SCM
 Repeated_music::minimum_start (SCM m)
 {
-  Music *me = Music::unsmob (m);
-  Music *body = Music::unsmob (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 ();
@@ -136,8 +136,8 @@ MAKE_SCHEME_CALLBACK (Repeated_music, first_start, 1);
 SCM
 Repeated_music::first_start (SCM m)
 {
-  Music *me = Music::unsmob (m);
-  Music *body = Music::unsmob (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"));