X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelative-octave-check.cc;h=12abf812541a94fc31e94eb740a313205b6a9f90;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=f0234b8af65107cb933e4a77877d1ae1f816a045;hpb=10f0e1d58eda7e8d5f3e7d5613ca2d976620e434;p=lilypond.git

diff --git a/lily/relative-octave-check.cc b/lily/relative-octave-check.cc
index f0234b8af6..12abf81254 100644
--- a/lily/relative-octave-check.cc
+++ b/lily/relative-octave-check.cc
@@ -1,38 +1,61 @@
-#include "relative-octave-check.hh"
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2005--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 "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_mus_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_notename (),
+                       check_p->get_alteration ());
 
       Pitch result = no_octave.to_relative_octave (p);
 
       if (result != *check_p)
-	{
-	  String s = _("Failed octave check, got: ");
-	  s += result.to_string ();
-	  
-	  origin ()->warning (s);
-	  
-	  delta_oct = check_p->get_octave () - result.get_octave ();
-	}
+        {
+          string s = _ ("Failed octave check, got: ");
+          s += result.to_string ();
+
+          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 ();
+}