X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper.cc;h=5f141c0c910478a4dbf4e8a8485971224fe55e94;hb=2649586f759f68254919874fc4568a50eff2919c;hp=939b90db94868a3787bded5602bae54a7345a2e6;hpb=4eee0d110ca632aa8adf3af223f7040c7b9752ff;p=lilypond.git

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 939b90db94..5f141c0c91 100644
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -1,41 +1,36 @@
-/*   
-  music-wrapper.cc --  implement Music_wrapper
-  
+/*
+  music-wrapper.cc -- implement Music_wrapper
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#include "music-wrapper.hh"
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-Music_wrapper::Music_wrapper (SCM x)
-  : Music (x)
-{
-}
+#include "music-wrapper.hh"
 
+#include "music.hh"
 
-MAKE_SCHEME_CALLBACK(Music_wrapper,length_callback,1);
+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 ();
-}