X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelative-octave-check.cc;h=bb597f97cb5b2da65cae30a0a4fed57c1c8c323e;hb=e90f0536f9be39ada0bef0aeb0d275dec3b2fb5b;hp=ee22516c07732a455509597ebd1ed63c013647eb;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git

diff --git a/lily/relative-octave-check.cc b/lily/relative-octave-check.cc
index ee22516c07..bb597f97cb 100644
--- a/lily/relative-octave-check.cc
+++ b/lily/relative-octave-check.cc
@@ -1,16 +1,39 @@
-#include "relative-octave-check.hh"
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2005--2011 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 "input.hh"
-#include "pitch.hh"
+#include "international.hh"
+#include "music.hh"
 
-/*
-  yeah, so this should be in a separate file.
-  I'm lazy.
- */
-Pitch
-Relative_octave_check::to_relative_octave (Pitch p)
+class Relative_octave_check
 {
-  Pitch * check_p = unsmob_pitch (get_property ("pitch"));
+public:
+  DECLARE_SCHEME_CALLBACK (relative_callback, (SCM, SCM));
+};
+
+MAKE_SCHEME_CALLBACK (Relative_octave_check, relative_callback, 2)
+  SCM
+Relative_octave_check::relative_callback (SCM music, SCM last_pitch)
+{
+  Pitch p = *unsmob_pitch (last_pitch);
+  Music *m = unsmob_music (music);
+  Pitch *check_p = unsmob_pitch (m->get_property ("pitch"));
 
   int delta_oct = 0;
   if (check_p)
@@ -23,17 +46,16 @@ Relative_octave_check::to_relative_octave (Pitch p)
 
       if (result != *check_p)
 	{
-	  String s = _("Failed octave check, got: ");
+	  string s = _ ("Failed octave check, got: ");
 	  s += result.to_string ();
-	  
-	  origin ()->warning (s);
-	  
+
+	  m->origin ()->warning (s);
+
 	  delta_oct = check_p->get_octave () - result.get_octave ();
 	}
     }
-  
-  return  Pitch (p.get_octave () + delta_oct,
-		 p.get_notename (), p.get_alteration ());
-}
 
-ADD_MUSIC (Relative_octave_check);
+  return Pitch (p.get_octave () + delta_oct,
+		p.get_notename (),
+		p.get_alteration ()).smobbed_copy ();
+}