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

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 8a2d66f5bd..3eac65aec6 100644
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -3,55 +3,38 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 
-#include "music-wrapper.hh"
-
-
-void
-Music_wrapper::do_print () const
-{
-  element ()->print ();
-}
 
-void
-Music_wrapper::transpose (Musical_pitch p)
-{
-  if (element ())
-    element ()-> transpose (p);
-}
+#include "music-wrapper.hh"
 
 
-Music_wrapper::Music_wrapper(Music*p)
+Music_wrapper::Music_wrapper ()
+  : Music ()
 {
-  set_mus_property ("element", p->self_scm ());
-  scm_unprotect_object (p->self_scm ());
 }
 
 Moment
-Music_wrapper::length_mom () const
+Music_wrapper::get_length () const
 {
-  return element ()->length_mom ();
+  return element ()->get_length ();
 }
 
-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"));
+  return unsmob_music (get_property ("element"));
 }
 
-void
-Music_wrapper::compress (Moment m)
+
+ADD_MUSIC (Music_wrapper);
+
+
+Moment
+Music_wrapper::start_mom () const
 {
-  element ()->compress (m);
+  return element ()->start_mom ();
 }