X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper.cc;h=3d58fca2ef3f6311465ce70df906f233faa6999e;hb=f9efd2c54b174591fa42889557686c7aea356547;hp=641c83b91ba32d5256186f79230a6d95deeaa95a;hpb=9c8bcb9a2a1fedb5459e593b18a8c550318e6800;p=lilypond.git

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 641c83b91b..3d58fca2ef 100644
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,23 +11,19 @@
 #include "music-wrapper.hh"
 
 
-void
-Music_wrapper::do_print () const
-{
-  element ()->print ();
-}
+
 
 void
-Music_wrapper::transpose (Musical_pitch p)
+Music_wrapper::transpose (Pitch p)
 {
   if (element ())
     element ()-> transpose (p);
 }
 
 
-Music_wrapper::Music_wrapper(Music*p)
+Music_wrapper::Music_wrapper (SCM l)
+  : Music (l)
 {
-  set_mus_property ("element", p->self_scm ());
 }
 
 Moment
@@ -36,8 +32,8 @@ Music_wrapper::length_mom () const
   return element ()->length_mom ();
 }
 
-Musical_pitch
-Music_wrapper::to_relative_octave (Musical_pitch p)
+Pitch
+Music_wrapper::to_relative_octave (Pitch p)
 {
   return element ()->to_relative_octave (p);
 }
@@ -54,3 +50,17 @@ Music_wrapper::compress (Moment m)
 {
   element ()->compress (m);
 }
+
+ADD_MUSIC (Music_wrapper);
+
+Music_wrapper::Music_wrapper ()
+  : Music (SCM_EOL)
+{
+  
+}
+
+Moment
+Music_wrapper::start_mom () const
+{
+  return element ()->start_mom ();
+}