X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-music.cc;h=3445eab175ea4ecce02b89c296ba7ac0d74f089e;hb=refs%2Fheads%2Fbugs%2F572290;hp=60599ebcf7ce66b9c6f2533120c0a11215b26a6e;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git

diff --git a/lily/grace-music.cc b/lily/grace-music.cc
index 60599ebcf7..3445eab175 100644
--- a/lily/grace-music.cc
+++ b/lily/grace-music.cc
@@ -1,36 +1,26 @@
-/*   
-     grace-music.cc --  implement Grace_music
-  
-     source file of the GNU LilyPond music typesetter
-  
-     (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
-*/
+/*
+  grace-music.cc -- implement Grace_music
 
-#include "grace-music.hh"
+  source file of the GNU LilyPond music typesetter
 
-#include "grace-iterator.hh"
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-Moment
-Grace_music::get_length () const
-{
-  Moment m;
-  return m;
-}
+#include "music.hh"
+#include "music-wrapper.hh"
 
-Moment
-Grace_music::start_mom () const
+class Grace_music
 {
-  Moment l = Music_wrapper::get_length ();
-  Moment gl;
-  gl.grace_part_ = -(l.main_part_ + l.grace_part_ );
-  return gl;
-}
+public:
+  DECLARE_SCHEME_CALLBACK (start_callback, (SCM));
+};
 
-Grace_music::Grace_music ()
+MAKE_SCHEME_CALLBACK (Grace_music, start_callback, 1);
+SCM
+Grace_music::start_callback (SCM m)
 {
-  set_property ("iterator-ctor",
-		Grace_iterator::constructor_proc);
+  Moment *l = unsmob_moment (Music_wrapper::length_callback (m));
+  Moment gl;
+  gl.grace_part_ = -(l->main_part_ + l->grace_part_);
+  return gl.smobbed_copy ();
 }
-
-ADD_MUSIC (Grace_music);