X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelative-octave-check.cc;h=12abf812541a94fc31e94eb740a313205b6a9f90;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=f7a81a78d105e3dd91cf9e33c6eeb134a45a8100;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git diff --git a/lily/relative-octave-check.cc b/lily/relative-octave-check.cc index f7a81a78d1..12abf81254 100644 --- a/lily/relative-octave-check.cc +++ b/lily/relative-octave-check.cc @@ -1,51 +1,61 @@ /* - relative-octave-check.cc -- implement Relative_octave_check + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2005--2015 Han-Wen Nienhuys - (c) 2005 Han-Wen Nienhuys + 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 . */ -#include "music.hh" #include "input.hh" -#include "pitch.hh" +#include "international.hh" +#include "music.hh" class Relative_octave_check { public: - DECLARE_SCHEME_CALLBACK(relative_callback, (SCM, SCM)); + DECLARE_SCHEME_CALLBACK (relative_callback, (SCM, SCM)); }; - -MAKE_SCHEME_CALLBACK(Relative_octave_check, relative_callback, 2) +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")); - + Pitch p = *unsmob (last_pitch); + Music *m = unsmob (music); + Pitch *check_p = unsmob (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 (); - - m->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 ()).smobbed_copy (); + p.get_notename (), + p.get_alteration ()).smobbed_copy (); }