X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelative-octave-check.cc;h=651702ce995df26143a19b054b0d8ac4b934151d;hb=f1ba395ada75b219b7522841f3dd51dcffd2bd8f;hp=51de14b84955dd53f51b2842ca9a2d521799fecc;hpb=b1323f33e9aa4b9eea05eefb8755c907d4d762d4;p=lilypond.git

diff --git a/lily/relative-octave-check.cc b/lily/relative-octave-check.cc
index 51de14b849..651702ce99 100644
--- a/lily/relative-octave-check.cc
+++ b/lily/relative-octave-check.cc
@@ -1,38 +1,50 @@
-#include "relative-octave-check.hh"
+/*
+  relative-octave-check.cc -- implement Relative_octave_check
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
 #include "input.hh"
+#include "international.hh"
+#include "music.hh"
 #include "pitch.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)
     {
       Pitch no_octave (-1,
 		       check_p->get_notename (),
-		       check_p->get_alteration());
+		       check_p->get_alteration ());
 
       Pitch result = no_octave.to_relative_octave (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 ();
+}