release: 1.3.93

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

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 97598e87afed995416f1523260411fd53109d910..ffcba963366d7dc7fdd934377b0aa158dcd28319 100644 (file)
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -1,64 +1,53 @@
 /*   
-  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--2000 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);
+  if (element ())
+    element ()-> transpose (p);
 }
 
 
 Music_wrapper::Music_wrapper(Music*p)
 {
-  element_p_ = p;
+  set_mus_property ("element", p->self_scm ());
+  scm_unprotect_object (p->self_scm ());
 }
 
-
-
 Moment
 Music_wrapper::length_mom () const
 {
-  return element_p_->length_mom ();
+  return element ()->length_mom ();
 }
 
-
 Musical_pitch
 Music_wrapper::to_relative_octave (Musical_pitch p)
 {
-  return element_p_->to_relative_octave (p);
+  return element ()->to_relative_octave (p);
 }
 
+
 Music*
-Music_wrapper::element_l () const
+Music_wrapper::element () const
+{
+  return unsmob_music (get_mus_property ("element"));
+}
+
+void
+Music_wrapper::compress (Moment m)
 {
-  return element_p_;
+  element ()->compress (m);
 }