2003 -> 2004

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

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 17c0fefa7b08b4d0f7c6506a3069bad5a7f71123..8118cc23aeb9969af6319159b9fdddb7537886df 100644 (file)
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -1,70 +1,41 @@
 /*   
-  music-wrapper.cc --  implement 
+  music-wrapper.cc --  implement Music_wrapper
   
   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)
+Music_wrapper::Music_wrapper ()
+  : Music ()
 {
-  if (element_p_)
-    element_p_-> transpose (p);
 }
 
-
-Music_wrapper::Music_wrapper(Music*p)
+Moment
+Music_wrapper::get_length () const
 {
-  element_p_ = p;
+  return element ()->get_length ();
 }
 
-
-
-Moment
-Music_wrapper::length_mom () const
+Music*
+Music_wrapper::element () const
 {
-  return element_p_->length_mom ();
+  return unsmob_music (get_mus_property ("element"));
 }
 
 
-Musical_pitch
-Music_wrapper::to_relative_octave (Musical_pitch p)
-{
-  return element_p_->to_relative_octave (p);
-}
+ADD_MUSIC (Music_wrapper);
 
-Music*
-Music_wrapper::element_l () const
-{
-  return element_p_;
-}
 
-void
-Music_wrapper::compress (Moment m)
+Moment
+Music_wrapper::start_mom () const
 {
-  element_l ()->compress (m);
+  return element ()->start_mom ();
 }