release: 1.5.0

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

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 8a2d66f5bd4f459328e7552cf47796e74e154ac7..2541483dddafc8939b73bdd05d9669a9f1c5e4a6 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,24 +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 ());
-  scm_unprotect_object (p->self_scm ());
 }
 
 Moment
@@ -37,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);
 }
@@ -55,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 ();
+}