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

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 71de46fc45..3e6a7d7c0b 100644
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -1,70 +1,36 @@
-/*   
-  music-wrapper.cc --  implement Music_wrapper
-  
+/*
+  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--2009 Han-Wen Nienhuys <hanwen@xs4all.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)
-{
-  element_p_ = p;
-}
-
-
+#include "music.hh"
 
-Moment
-Music_wrapper::length_mom () const
+MAKE_SCHEME_CALLBACK (Music_wrapper, start_callback, 1);
+SCM
+Music_wrapper::start_callback (SCM m)
 {
-  return element_p_->length_mom ();
+  Music *me = unsmob_music (m);
+  Music *elt = unsmob_music (me->get_property ("element"));
+  if (elt)
+    return elt->start_mom ().smobbed_copy ();
+  else
+    return Moment ().smobbed_copy ();
 }
 
-Musical_pitch
-Music_wrapper::to_relative_octave (Musical_pitch p)
+MAKE_SCHEME_CALLBACK (Music_wrapper, length_callback, 1);
+SCM
+Music_wrapper::length_callback (SCM m)
 {
-  return element_p_->to_relative_octave (p);
+  Music *me = unsmob_music (m);
+  Music *elt = unsmob_music (me->get_property ("element"));
+  if (elt)
+    return elt->get_length ().smobbed_copy ();
+  else
+    return Moment (0).smobbed_copy ();
 }
 
-
-Music*
-Music_wrapper::element_l () const
-{
-  return element_p_;
-}
-
-void
-Music_wrapper::compress (Moment m)
-{
-  element_l ()->compress (m);
-}