X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper.cc;h=b13d7fac608c3b63924d8fce5f367998acb3e28a;hb=3e958aa906558831211e954cc2648666c85d39b7;hp=71de46fc45bc17d6027be97bd1d3c809ee75b68d;hpb=339ea28cd7e4f8a1c1ca7c1d4dfe803a3f4c03e6;p=lilypond.git

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 71de46fc45..b13d7fac60 100644
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -3,68 +3,39 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 
 #include "music-wrapper.hh"
 
-Music_wrapper::~Music_wrapper ()
-{
-  delete element_p_;
-}
-
-Music_wrapper::Music_wrapper (Music_wrapper const&s)
-  : Music (s)
-{
-  element_p_ = (s.element_p_)?s.element_p_->clone ():0;
-}
-
-
-void
-Music_wrapper::do_print () const
-{
-  element_p_->print ();
-}
-
 
-void
-Music_wrapper::transpose (Musical_pitch p)
-{
-  if (element_p_)
-    element_p_-> transpose (p);
-}
 
 
-Music_wrapper::Music_wrapper(Music*p)
+Music_wrapper::Music_wrapper ()
+  : Music ()
 {
-  element_p_ = p;
 }
 
-
-
 Moment
-Music_wrapper::length_mom () const
+Music_wrapper::get_length () const
 {
-  return element_p_->length_mom ();
+  return element ()->get_length ();
 }
 
-Musical_pitch
-Music_wrapper::to_relative_octave (Musical_pitch p)
+Music*
+Music_wrapper::element () const
 {
-  return element_p_->to_relative_octave (p);
+  return unsmob_music (get_property ("element"));
 }
 
 
-Music*
-Music_wrapper::element_l () const
-{
-  return element_p_;
-}
+ADD_MUSIC (Music_wrapper);
 
-void
-Music_wrapper::compress (Moment m)
+
+Moment
+Music_wrapper::start_mom () const
 {
-  element_l ()->compress (m);
+  return element ()->start_mom ();
 }