Release: bump Welcome versions.

[lilypond.git] / lily / relative-octave-check.cc

diff --git a/lily/relative-octave-check.cc b/lily/relative-octave-check.cc
index bb597f97cb5b2da65cae30a0a4fed57c1c8c323e..12abf812541a94fc31e94eb740a313205b6a9f90 100644 (file)
--- a/lily/relative-octave-check.cc
+++ b/lily/relative-octave-check.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  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
@@ -28,34 +28,34 @@ public:
 };
 
 MAKE_SCHEME_CALLBACK (Relative_octave_check, relative_callback, 2)
-  SCM
+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"));
+  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 ();
+        {
+          string s = _ ("Failed octave check, got: ");
+          s += result.to_string ();
 
-         m->origin ()->warning (s);
+          m->origin ()->warning (s);
 
-         delta_oct = check_p->get_octave () - result.get_octave ();
-       }
+          delta_oct = check_p->get_octave () - result.get_octave ();
+        }
     }
 
   return Pitch (p.get_octave () + delta_oct,
-               p.get_notename (),
-               p.get_alteration ()).smobbed_copy ();
+                p.get_notename (),
+                p.get_alteration ()).smobbed_copy ();
 }