X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper.cc;h=f3feee844952fd87d7c16be226066e5011329509;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=ffcba963366d7dc7fdd934377b0aa158dcd28319;hpb=f988425624a6f6d1a48aea0ac0c1c84ff0857e56;p=lilypond.git

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index ffcba96336..f3feee8449 100644
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -1,53 +1,47 @@
-/*   
-  music-wrapper.cc --  implement Music_wrapper
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
+  Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-#include "music-wrapper.hh"
-
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-void
-Music_wrapper::transpose (Musical_pitch p)
-{
-  if (element ())
-    element ()-> transpose (p);
-}
-
-
-Music_wrapper::Music_wrapper(Music*p)
-{
-  set_mus_property ("element", p->self_scm ());
-  scm_unprotect_object (p->self_scm ());
-}
+#include "music-wrapper.hh"
 
-Moment
-Music_wrapper::length_mom () const
-{
-  return element ()->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 ()->to_relative_octave (p);
+  Music *me = Music::unsmob (m);
+  Music *elt = Music::unsmob (me->get_property ("element"));
+  if (elt)
+    return elt->start_mom ().smobbed_copy ();
+  else
+    return Moment ().smobbed_copy ();
 }
 
-
-Music*
-Music_wrapper::element () const
+MAKE_SCHEME_CALLBACK (Music_wrapper, length_callback, 1);
+SCM
+Music_wrapper::length_callback (SCM m)
 {
-  return unsmob_music (get_mus_property ("element"));
+  Music *me = Music::unsmob (m);
+  Music *elt = Music::unsmob (me->get_property ("element"));
+  if (elt)
+    return elt->get_length ().smobbed_copy ();
+  else
+    return Moment (0).smobbed_copy ();
 }
 
-void
-Music_wrapper::compress (Moment m)
-{
-  element ()->compress (m);
-}