X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music.cc;h=9cf603a3a4929f70aaef18db2c0a5779f0985c8e;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=dca904f2e84031e41dbf55678adbe2176185fbfd;hpb=17a0be44b562c72ccfebf2bef4a7a6fcc07bd02f;p=lilypond.git

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index dca904f2e8..9cf603a3a4 100644
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -1,14 +1,23 @@
 /*
-  lyric-combine-music.cc -- implement Lyric_combine_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--2005 Han-Wen Nienhuys <hanwen@cs.uu.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"
-#include "moment.hh"
 
 struct Lyric_combine_music
 {
@@ -20,7 +29,7 @@ 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 = unsmob<Music> (m);
+  Music *melody = unsmob<Music> (scm_car (me->get_property ("elements")));
   return melody->get_length ().smobbed_copy ();
 }