X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper.cc;h=968c4447a7ab8c4f06129b2111e670f7a9968fc3;hb=9ca7fe6e8194a1db742ca381cbcd53c5a3d4e7ad;hp=b13d7fac608c3b63924d8fce5f367998acb3e28a;hpb=b1323f33e9aa4b9eea05eefb8755c907d4d762d4;p=lilypond.git

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index b13d7fac60..968c4447a7 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>
-  
- */
 
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "music-wrapper.hh"
 
+#include "music.hh"
 
-
-
-Music_wrapper::Music_wrapper ()
-  : Music ()
-{
-}
-
-Moment
-Music_wrapper::get_length () const
+MAKE_SCHEME_CALLBACK (Music_wrapper, start_callback, 1);
+SCM
+Music_wrapper::start_callback (SCM m)
 {
-  return element ()->get_length ();
+  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 ();
 }
 
-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 ();
-}