X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper.cc;h=5dbc265b0088ccbf27f90b1ff174183ba0967dad;hb=f42142c17b68d84721597f8abf400fa18364b118;hp=a8dbf95bff293f9472c17d68e6956c8f86bc7048;hpb=ea1b3696c02bb143fc7faf8b872a5c23c0725fef;p=lilypond.git

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index a8dbf95bff..5dbc265b00 100644
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -1,43 +1,47 @@
-/*   
-  music-wrapper.cc --  implement Music_wrapper
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-#include "music-wrapper.hh"
+  Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-Music_wrapper::Music_wrapper (SCM x)
-  : Music (x)
-{
-  if (!ly_c_procedure_p (length_callback_))
-    length_callback_ = length_callback_proc; 
-}
+  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/>.
+*/
 
-MAKE_SCHEME_CALLBACK(Music_wrapper,length_callback,1);
+#include "music-wrapper.hh"
+
+#include "music.hh"
+
+MAKE_SCHEME_CALLBACK (Music_wrapper, start_callback, 1);
 SCM
-Music_wrapper::length_callback (SCM m)
+Music_wrapper::start_callback (SCM m)
 {
-  Music * me = unsmob_music (m);
+  Music *me = unsmob_music (m);
   Music *elt = unsmob_music (me->get_property ("element"));
-  return elt->get_length ().smobbed_copy ();
+  if (elt)
+    return elt->start_mom ().smobbed_copy ();
+  else
+    return Moment ().smobbed_copy ();
 }
 
-Music*
-Music_wrapper::element () const
+MAKE_SCHEME_CALLBACK (Music_wrapper, length_callback, 1);
+SCM
+Music_wrapper::length_callback (SCM m)
 {
-  return unsmob_music (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
+    return Moment (0).smobbed_copy ();
 }
 
-
-ADD_MUSIC (Music_wrapper);
-
-
-Moment
-Music_wrapper::start_mom () const
-{
-  return element ()->start_mom ();
-}