X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper.cc;h=adf510c2f8473eea6a8887c8046c7285721d6d42;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=051187a8a4215f6d3feb6e6e8cd2283526448d70;hpb=f0c09b6ffea7595f741e39419d24d318566d710e;p=lilypond.git

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 051187a8a4..adf510c2f8 100644
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -1,9 +1,20 @@
 /*
-  music-wrapper.cc -- implement Music_wrapper
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1998--2006 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-wrapper.hh"
@@ -14,17 +25,20 @@ MAKE_SCHEME_CALLBACK (Music_wrapper, start_callback, 1);
 SCM
 Music_wrapper::start_callback (SCM m)
 {
-  Music *me = unsmob_music (m);
-  Music *elt = unsmob_music (me->get_property ("element"));
-  return elt->start_mom ().smobbed_copy ();
+  Music *me = unsmob<Music> (m);
+  Music *elt = unsmob<Music> (me->get_property ("element"));
+  if (elt)
+    return elt->start_mom ().smobbed_copy ();
+  else
+    return Moment ().smobbed_copy ();
 }
 
 MAKE_SCHEME_CALLBACK (Music_wrapper, length_callback, 1);
 SCM
 Music_wrapper::length_callback (SCM m)
 {
-  Music *me = unsmob_music (m);
-  Music *elt = unsmob_music (me->get_property ("element"));
+  Music *me = unsmob<Music> (m);
+  Music *elt = unsmob<Music> (me->get_property ("element"));
   if (elt)
     return elt->get_length ().smobbed_copy ();
   else