release: 1.5.37

[lilypond.git] / lily / music-wrapper.cc

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index ffcba963366d7dc7fdd934377b0aa158dcd28319..3d58fca2ef3f6311465ce70df906f233faa6999e 100644 (file)
--- 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>
   
  */
 
@@ -14,17 +14,16 @@
 
 
 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 ());
-  scm_unprotect_object (p->self_scm ());
 }
 
 Moment
@@ -33,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);
 }
@@ -51,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 ();
+}