X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper.cc;h=968c4447a7ab8c4f06129b2111e670f7a9968fc3;hb=8ad8f9dd676f29066c66bc57d6c6be53151c941c;hp=4512e26fc2033bbb0b9ff8df701cc871dbc95ed1;hpb=434da79e9d7684b2b05fa92a6d808d4ea7933046;p=lilypond.git

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 4512e26fc2..968c4447a7 100644
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -1,75 +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--2007 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;
-}
-
-
-
-Moment
-Music_wrapper::length_mom () const
-{
-  return element_p_->length_mom ();
-}
+#include "music.hh"
 
-Musical_pitch
-Music_wrapper::to_relative_octave (Musical_pitch p)
+MAKE_SCHEME_CALLBACK (Music_wrapper, start_callback, 1);
+SCM
+Music_wrapper::start_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->start_mom ().smobbed_copy ();
+  else
+    return Moment ().smobbed_copy ();
 }
 
-Music_iterator*
-Music_wrapper::to_rhythm (Music_iterator* r)
+MAKE_SCHEME_CALLBACK (Music_wrapper, length_callback, 1);
+SCM
+Music_wrapper::length_callback (SCM m)
 {
-  return element_p_->to_rhythm (r);
+  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);
-}