X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper.cc;h=968c4447a7ab8c4f06129b2111e670f7a9968fc3;hb=160d77656b77df6746565208a11f8fa718f71471;hp=7106707d5a4abe8f2f6e23df8959cb801a664253;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 7106707d5a..968c4447a7 100644
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -3,19 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music-wrapper.hh"
 
-Music_wrapper::Music_wrapper (SCM x)
-  : Music (x)
-{
-  if (!ly_c_procedure_p (length_callback_))
-    length_callback_ = length_callback_proc;
-  if (!ly_c_procedure_p (start_callback_))
-    start_callback_ = length_callback_proc;
-}
+#include "music.hh"
 
 MAKE_SCHEME_CALLBACK (Music_wrapper, start_callback, 1);
 SCM
@@ -23,7 +16,10 @@ 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 ();
+  if (elt)
+    return elt->start_mom ().smobbed_copy ();
+  else
+    return Moment ().smobbed_copy ();
 }
 
 MAKE_SCHEME_CALLBACK (Music_wrapper, length_callback, 1);
@@ -32,14 +28,9 @@ Music_wrapper::length_callback (SCM m)
 {
   Music *me = unsmob_music (m);
   Music *elt = unsmob_music (me->get_property ("element"));
-  return elt->get_length ().smobbed_copy ();
-}
-
-Music *
-Music_wrapper::element () const
-{
-  return unsmob_music (get_property ("element"));
+  if (elt)
+    return elt->get_length ().smobbed_copy ();
+  else
+    return Moment (0).smobbed_copy ();
 }
 
-ADD_MUSIC (Music_wrapper);
-