*** empty log message ***

[lilypond.git] / lily / grace-music.cc

diff --git a/lily/grace-music.cc b/lily/grace-music.cc
index 02abe88c6046575af8250607f835ebcb9ed76d05..2dcfda4e0b523ef2ed06151b4aa6897d943fcb32 100644 (file)
--- a/lily/grace-music.cc
+++ b/lily/grace-music.cc
@@ -3,25 +3,25 @@
   
      source file of the GNU LilyPond music typesetter
   
-     (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+     (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
 */
 
-#include "grace-music.hh"
-#include "grace-iterator.hh"
+#include "music.hh"
+#include "music-wrapper.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);