X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music.cc;h=7611d7554378e2ced26e1b0fe3162e0bb08c1e71;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=2775f7acab3367b99548ee1c05424a605826374e;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index 2775f7acab..7611d75543 100644
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -1,27 +1,35 @@
-/*   
-  lyric-combine-music.cc --  implement Lyric_combine_music
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  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
+  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 "music.hh"
-#include "pitch.hh"
 
 struct Lyric_combine_music
 {
 public:
-  DECLARE_SCHEME_CALLBACK(length_callback,(SCM));
+  DECLARE_SCHEME_CALLBACK (length_callback, (SCM));
 };
 
-
-MAKE_SCHEME_CALLBACK(Lyric_combine_music,length_callback,1);
+MAKE_SCHEME_CALLBACK (Lyric_combine_music, length_callback, 1);
 SCM
 Lyric_combine_music::length_callback (SCM m)
 {
-  Music * me = unsmob_music (m);
-  Music *melody = unsmob_music (scm_car (me->get_property ("elements")));
+  Music *me = Music::unsmob (m);
+  Music *melody = Music::unsmob (scm_car (me->get_property ("elements")));
   return melody->get_length ().smobbed_copy ();
 }