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

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 81ee249605..3eac65aec6 100644
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -1,58 +1,40 @@
 /*   
-  music-wrapper.cc --  implement 
+  music-wrapper.cc --  implement Music_wrapper
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 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)
+Music_wrapper::Music_wrapper ()
+  : Music ()
 {
-  element_p_ = (s.element_p_)?s.element_p_->clone ():0;
 }
 
-
-void
-Music_wrapper::do_print () const
+Moment
+Music_wrapper::get_length () const
 {
-  element_p_->print ();
+  return element ()->get_length ();
 }
 
-
-void
-Music_wrapper::transpose (Musical_pitch p)
+Music*
+Music_wrapper::element () const
 {
-  if (element_p_)
-    element_p_-> transpose (p);
+  return unsmob_music (get_property ("element"));
 }
 
 
-Music_wrapper::Music_wrapper(Music*p)
-{
-  element_p_ = p;
-}
-
+ADD_MUSIC (Music_wrapper);
 
 
 Moment
-Music_wrapper::duration () const
-{
-  return element_p_->duration ();
-}
-
-
-Musical_pitch
-Music_wrapper::to_relative_octave (Musical_pitch p)
+Music_wrapper::start_mom () const
 {
-  return element_p_->to_relative_octave (p);
+  return element ()->start_mom ();
 }