release: 1.3.93

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

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 2e241d5800ea08f6b67aac7ed7e306843ca13241..ffcba963366d7dc7fdd934377b0aa158dcd28319 100644 (file)
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -1,49 +1,53 @@
 /*   
-  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.ruu.nl>
+  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 
 #include "music-wrapper.hh"
 
-Music_wrapper::~Music_wrapper ()
+
+
+
+void
+Music_wrapper::transpose (Musical_pitch p)
 {
-  delete element_p_;
+  if (element ())
+    element ()-> transpose (p);
 }
 
-Music_wrapper::Music_wrapper (Music_wrapper const&s)
-  : Music (s)
+
+Music_wrapper::Music_wrapper(Music*p)
 {
-  element_p_ = (s.element_p_)?s.element_p_->clone ():0;
+  set_mus_property ("element", p->self_scm ());
+  scm_unprotect_object (p->self_scm ());
 }
 
-
-void
-Music_wrapper::do_print () const
+Moment
+Music_wrapper::length_mom () const
 {
-  element_p_->print ();
+  return element ()->length_mom ();
 }
-void
-Music_wrapper::transpose (Musical_pitch p)
+
+Musical_pitch
+Music_wrapper::to_relative_octave (Musical_pitch p)
 {
-  if (element_p_)
-    element_p_-> transpose (p);
+  return element ()->to_relative_octave (p);
 }
 
 
-Music_wrapper::Music_wrapper(Music*p)
+Music*
+Music_wrapper::element () const
 {
-  element_p_ = p;
+  return unsmob_music (get_mus_property ("element"));
 }
 
-IMPLEMENT_IS_TYPE_B1 (Music_wrapper, Music);
-
-MInterval
-Music_wrapper::time_int () const
+void
+Music_wrapper::compress (Moment m)
 {
-  return element_p_->time_int ();
+  element ()->compress (m);
 }