X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper.cc;h=3e6a7d7c0b34518bcf1d9fa19098f2b635c5a622;hb=69bfbbd345ec788aef31315b6174cd15a2e3a48e;hp=801af5b8e9c3390d9afea8411b94218380656bd4;hpb=4975901229a1b074f6c93d812e15d653aa8e2952;p=lilypond.git

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 801af5b8e9..3e6a7d7c0b 100644
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -1,53 +1,36 @@
-/*   
-  music-wrapper.cc --  implement Music_wrapper
-  
+/*
+  music-wrapper.cc -- implement Music_wrapper
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "music-wrapper.hh"
 
+#include "music.hh"
 
-
-
-void
-Music_wrapper::transpose (Pitch p)
-{
-  if (element ())
-    element ()-> transpose (p);
-}
-
-
-Music_wrapper::Music_wrapper(Music*p)
-{
-  set_mus_property ("element", p->self_scm ());
-  scm_unprotect_object (p->self_scm ());
-}
-
-Moment
-Music_wrapper::length_mom () const
-{
-  return element ()->length_mom ();
-}
-
-Pitch
-Music_wrapper::to_relative_octave (Pitch p)
+MAKE_SCHEME_CALLBACK (Music_wrapper, start_callback, 1);
+SCM
+Music_wrapper::start_callback (SCM m)
 {
-  return element ()->to_relative_octave (p);
+  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_mus_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 ();
 }
 
-void
-Music_wrapper::compress (Moment m)
-{
-  element ()->compress (m);
-}