X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-music.cc;h=8337a0b7f5e2b1bb72ee0b5d126900abec60f45c;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=895764682bc702a3e9275070f63d769ffa12d015;hpb=728e41a1741382885396935663e35f9dceaf1d49;p=lilypond.git

diff --git a/lily/grace-music.cc b/lily/grace-music.cc
index 895764682b..8337a0b7f5 100644
--- a/lily/grace-music.cc
+++ b/lily/grace-music.cc
@@ -1,35 +1,37 @@
-/*   
-     grace-music.cc --  implement Grace_music
-  
-     source file of the GNU LilyPond music typesetter
-  
-     (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  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/>.
 */
 
-#include "grace-music.hh"
-#include "grace-iterator.hh"
+#include "music.hh"
+#include "music-wrapper.hh"
 
-Moment
-Grace_music::get_length () const
+class Grace_music
 {
-  Moment m;
-  return m;
-}
+public:
+  DECLARE_SCHEME_CALLBACK (start_callback, (SCM));
+};
 
-Moment
-Grace_music::start_mom () const
+MAKE_SCHEME_CALLBACK (Grace_music, start_callback, 1);
+SCM
+Grace_music::start_callback (SCM m)
 {
-  Moment l = Music_wrapper::get_length ();
+  Moment *l = unsmob<Moment> (Music_wrapper::length_callback (m));
   Moment gl;
-  gl.grace_part_ = -(l.main_part_ + l.grace_part_ );
-  return gl;
+  gl.grace_part_ = -(l->main_part_ + l->grace_part_);
+  return gl.smobbed_copy ();
 }
-
-Grace_music::Grace_music ()
-{
-  set_property ("iterator-ctor",
-		Grace_iterator::constructor_proc);
-}
-
-ADD_MUSIC (Grace_music);