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

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 8a2d66f5bd..968c4447a7 100644
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -1,57 +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--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "music-wrapper.hh"
 
+#include "music.hh"
 
-void
-Music_wrapper::do_print () const
+MAKE_SCHEME_CALLBACK (Music_wrapper, start_callback, 1);
+SCM
+Music_wrapper::start_callback (SCM m)
 {
-  element ()->print ();
+  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 ();
 }
 
-void
-Music_wrapper::transpose (Musical_pitch p)
-{
-  if (element ())
-    element ()-> transpose (p);
-}
-
-
-Music_wrapper::Music_wrapper(Music*p)
+MAKE_SCHEME_CALLBACK (Music_wrapper, length_callback, 1);
+SCM
+Music_wrapper::length_callback (SCM m)
 {
-  set_mus_property ("element", p->self_scm ());
-  scm_unprotect_object (p->self_scm ());
+  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 ();
 }
 
-Moment
-Music_wrapper::length_mom () const
-{
-  return element ()->length_mom ();
-}
-
-Musical_pitch
-Music_wrapper::to_relative_octave (Musical_pitch p)
-{
-  return element ()->to_relative_octave (p);
-}
-
-
-Music*
-Music_wrapper::element () const
-{
-  return unsmob_music (get_mus_property ("element"));
-}
-
-void
-Music_wrapper::compress (Moment m)
-{
-  element ()->compress (m);
-}