X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-music.cc;h=bf3e304f16a51c2b757d6e7b80c0684149f539a2;hb=2629d27674cdc52137a4fb0ce62200cfb7ce7e91;hp=02abe88c6046575af8250607f835ebcb9ed76d05;hpb=4eee0d110ca632aa8adf3af223f7040c7b9752ff;p=lilypond.git

diff --git a/lily/grace-music.cc b/lily/grace-music.cc
index 02abe88c60..bf3e304f16 100644
--- a/lily/grace-music.cc
+++ b/lily/grace-music.cc
@@ -1,27 +1,27 @@
-/*   
-     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
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "grace-music.hh"
-#include "grace-iterator.hh"
+#include "music.hh"
+#include "music-wrapper.hh"
+#include "moment.hh"
 
-Moment
-Grace_music::start_mom () const
+class Grace_music
 {
-  Moment *l = unsmob_moment (Music_wrapper::length_callback (self_scm ()));
-  Moment gl;
-  gl.grace_part_ = -(l->main_part_ + l->grace_part_ );
-  return gl;
-}
+public:
+  DECLARE_SCHEME_CALLBACK (start_callback, (SCM));
+};
 
-Grace_music::Grace_music (SCM x)
-  : Music_wrapper (x)
+MAKE_SCHEME_CALLBACK (Grace_music, start_callback, 1);
+SCM
+Grace_music::start_callback (SCM m)
 {
+  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);