X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch.cc;h=b26076a0083c88efcb48ee476e2e2efe7526dc38;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=79a1b66635f4eae8a472cf9202fa8a650ced3f5e;hpb=492f3643bd2a86956201c3e0c93bb1b65bcdea4e;p=lilypond.git diff --git a/lily/pitch.cc b/lily/pitch.cc index 79a1b66635..b26076a008 100644 --- a/lily/pitch.cc +++ b/lily/pitch.cc @@ -1,275 +1,252 @@ -/* - musical-pitch.cc -- implement Pitch - - source file of the GNU LilyPond music typesetter - - (c) 1998--2002 Han-Wen Nienhuys - - */ +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1998--2012 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 "pitch.hh" -#include "debug.hh" -#include "main.hh" -#include "ly-smobs.icc" +#include "main.hh" +#include "scale.hh" +#include "string-convert.hh" +#include "warn.hh" +#include "ly-smobs.icc" +#include -Pitch::Pitch (int o, int n, int a) +Pitch::Pitch (int o, int n, Rational a) { - notename_i_ = n; - alteration_i_ = a; - octave_i_ = o; - - if (n < 0 || n >= 7 || - a < -2 || a > 2) - { - String s = _ ("Pitch arguments out of range"); - s += ": alteration = " + to_str (a); - s += ", notename = " + to_str (n); - warning (s); - } - normalise (); + notename_ = n; + alteration_ = a; + octave_ = o; + scale_ = default_global_scale; + normalize_octave (); } +/* FIXME: why is octave == 0 and default not middleC ? */ Pitch::Pitch () { - notename_i_ = 0; - alteration_i_ = 0; - octave_i_ = 0; + notename_ = 0; + scale_ = default_global_scale; + octave_ = 0; + alteration_ = (Rational)0; } int Pitch::compare (Pitch const &m1, Pitch const &m2) { - int o= m1.octave_i_ - m2.octave_i_; - int n = m1.notename_i_ - m2.notename_i_; - int a = m1.alteration_i_ - m2.alteration_i_; + int o = m1.octave_ - m2.octave_; + int n = m1.notename_ - m2.notename_; + Rational a = m1.alteration_ - m2.alteration_; if (o) - return o; + return o; if (n) - return n; + return n; if (a) - return a; + return a > (Rational)0 ? 1 : -1; + return 0; } int Pitch::steps () const { - return notename_i_ + octave_i_*7; + return notename_ + octave_ * scale_->step_count (); } -/* - should be settable from input? - */ -static Byte pitch_byte_a[ ] = { 0, 2, 4, 5, 7, 9, 11 }; - +Rational +Pitch::tone_pitch () const +{ + return scale_->tones_at_step (notename_, octave_) + alteration_; +} /* Calculate pitch height in 12th octave steps. Don't assume - normalised pitch as this function is used to normalise the pitch. */ + normalized pitch as this function is used to normalize the pitch. */ int -Pitch::semitone_pitch () const +Pitch::rounded_semitone_pitch () const { - int o = octave_i_; - int n = notename_i_; - while (n < 0) - { - n += 7; - o --; - } - return (o + n / 7) * 12 + pitch_byte_a[n % 7] + alteration_i_; + return int (floor (double (tone_pitch () * Rational (2) + Rational (1, 2)))); +} + +int +Pitch::rounded_quartertone_pitch () const +{ + return int (floor (double (tone_pitch () * Rational (4) + Rational (1, 2)))); } void -Pitch::normalise () +Pitch::normalize_octave () { - int pitch = semitone_pitch (); - while (notename_i_ >= 7) - { - notename_i_ -= 7; - octave_i_++; - alteration_i_ -= semitone_pitch () - pitch; - } - while (notename_i_ < 0) - { - notename_i_ += 7; - octave_i_--; - alteration_i_ -= semitone_pitch () - pitch; - } - while (alteration_i_ >= 3) + int normalized_step = notename_ % scale_->step_count (); + if (normalized_step < 0) + normalized_step += scale_->step_count (); + + octave_ += (notename_ - normalized_step) / scale_->step_count (); + notename_ = normalized_step; +} + +void +Pitch::normalize_alteration () +{ + while (alteration_ > Rational (1)) { - if (notename_i_ == 6) - { - notename_i_ = 0; - octave_i_++; - } - else - notename_i_++; - - alteration_i_ = 0; - alteration_i_ -= semitone_pitch () - pitch; + alteration_ -= scale_->step_size (notename_); + notename_++; } - while (alteration_i_ <= -3) + while (alteration_ < Rational (-1)) { - if (notename_i_ == 0) - { - notename_i_ = 6; - octave_i_--; - } - else - notename_i_--; - - alteration_i_ = 0; - alteration_i_ -= semitone_pitch () - pitch; + notename_--; + alteration_ += scale_->step_size (notename_); } } -/* WHugh, wat een intervaas */ +void +Pitch::normalize () +{ + normalize_alteration (); + normalize_octave (); +} + void Pitch::transpose (Pitch delta) { - int old_semi = semitone_pitch (); - int delta_semi = delta.semitone_pitch (); - octave_i_ += delta.octave_i_; - notename_i_ += delta.notename_i_; + Rational new_alter = tone_pitch () + delta.tone_pitch (); - int new_semi = semitone_pitch (); - int delta_acc = new_semi - old_semi - delta_semi; - alteration_i_ -= delta_acc; + octave_ += delta.octave_; + notename_ += delta.notename_; + alteration_ += new_alter - tone_pitch (); - normalise (); + normalize_octave (); } +Pitch +pitch_interval (Pitch const &from, Pitch const &to) +{ + Rational sound = to.tone_pitch () - from.tone_pitch (); + Pitch pt (to.get_octave () - from.get_octave (), + to.get_notename () - from.get_notename (), + + to.get_alteration () - from.get_alteration ()); + + return pt.transposed (Pitch (0, 0, sound - pt.tone_pitch ())); +} /* FIXME - Merge with *pitch->text* funcs in chord-name.scm - */ -char const *accname[] = {"eses", "es", "", "is" , "isis"}; + Merge with *pitch->text* funcs in chord-name.scm */ +char const *accname[] = {"eses", "eseh", "es", "eh", "", + "ih", "is", "isih", "isis" + }; -String -Pitch::str () const +string +Pitch::to_string () const { - int n = (notename_i_ + 2) % 7; - String s = to_str (char (n + 'a')); - if (alteration_i_) - s += String (accname[alteration_i_ + 2]); + int n = (notename_ + 2) % scale_->step_count (); + string s = ::to_string (char (n + 'a')); + Rational qtones = alteration_ * Rational (4, 1); + int qt = int (rint (Real (qtones))); - if (octave_i_ >= 0) + s += string (accname[qt + 4]); + if (octave_ >= 0) { - int o = octave_i_ + 1; + int o = octave_ + 1; while (o--) - s += "'"; + s += "'"; } - else if (octave_i_ < 0) + else if (octave_ < 0) { - int o = (-octave_i_) - 1; + int o = (-octave_) - 1; while (o--) - s += to_str (','); + s += ::to_string (','); } return s; } -/* - change me to relative, counting from last pitch p - return copy of resulting pitch - */ +/* Change me to relative, counting from last pitch p + return copy of resulting pitch. */ Pitch -Pitch::to_relative_octave (Pitch p) +Pitch::to_relative_octave (Pitch p) const { - int oct_mod = octave_i_ + 1; // account for c' = octave 1 iso. 0 4 + /* account for c' = octave 1 iso. 0 4 */ + int oct_mod = octave_ + 1; Pitch up_pitch (p); Pitch down_pitch (p); - up_pitch.alteration_i_ = alteration_i_; - down_pitch.alteration_i_ = alteration_i_; - + up_pitch.alteration_ = alteration_; + down_pitch.alteration_ = alteration_; + Pitch n = *this; - up_pitch.up_to (notename_i_); - down_pitch.down_to (notename_i_); + up_pitch.up_to (notename_); + down_pitch.down_to (notename_); int h = p.steps (); if (abs (up_pitch.steps () - h) < abs (down_pitch.steps () - h)) n = up_pitch; else n = down_pitch; - - n.octave_i_ += oct_mod; - *this = n; - return *this; + n.octave_ += oct_mod; + return n; } void Pitch::up_to (int notename) { - if (notename_i_ > notename) - { - octave_i_ ++; - } - notename_i_ = notename; + if (notename_ > notename) + octave_++; + notename_ = notename; } void Pitch::down_to (int notename) { - if (notename_i_ < notename) - { - octave_i_ --; - } - notename_i_ = notename; + if (notename_ < notename) + octave_--; + notename_ = notename; } - -LY_DEFINE(ly_pitch_transpose, - "ly-transpose-pitch", 2, 0, 0, - (SCM p, SCM delta), - "Transpose @var{p} by the amount @var{delta}, where @var{delta} is the -pitch that central C is transposed to. -") -{ - Pitch* t = unsmob_pitch (p); - Pitch *d = unsmob_pitch (delta); - SCM_ASSERT_TYPE(t, p, SCM_ARG1, __FUNCTION__, "pitch") ; - SCM_ASSERT_TYPE(d, delta, SCM_ARG1, __FUNCTION__, "pitch") ; - - Pitch tp =*t; - tp.transpose (*d); - return tp.smobbed_copy (); -} - -/****************************************************************/ - - -IMPLEMENT_TYPE_P (Pitch, "pitch?"); +IMPLEMENT_TYPE_P (Pitch, "ly:pitch?"); SCM -Pitch::mark_smob (SCM) +Pitch::mark_smob (SCM x) { - return SCM_EOL; + Pitch *p = (Pitch *) SCM_CELL_WORD_1 (x); + return p->scale_->self_scm (); } IMPLEMENT_SIMPLE_SMOBS (Pitch); int Pitch::print_smob (SCM s, SCM port, scm_print_state *) { - Pitch *r = (Pitch *) ly_cdr (s); - + Pitch *r = (Pitch *) SCM_CELL_WORD_1 (s); scm_puts ("#str ().ch_C ()), port); + scm_display (ly_string2scm (r->to_string ()), port); scm_puts (" >", port); - return 1; } SCM -Pitch::equal_p (SCM a , SCM b) +Pitch::equal_p (SCM a, SCM b) { - Pitch *p = (Pitch *) ly_cdr (a); - Pitch *q = (Pitch *) ly_cdr (b); + Pitch *p = (Pitch *) SCM_CELL_WORD_1 (a); + Pitch *q = (Pitch *) SCM_CELL_WORD_1 (b); - bool eq = p->notename_i_ == q->notename_i_ - && p->octave_i_ == q->octave_i_ - && p->alteration_i_ == q->alteration_i_; + bool eq = p->notename_ == q->notename_ + && p->octave_ == q->octave_ + && p->alteration_ == q->alteration_; return eq ? SCM_BOOL_T : SCM_BOOL_F; } @@ -287,102 +264,47 @@ Pitch::less_p (SCM p1, SCM p2) return SCM_BOOL_F; } -/* - should add optional args - */ - -LY_DEFINE(make_pitch, "make-pitch", 3, 0, 0, - (SCM o, SCM n, SCM a), - " -@var{octave} is specified by an integer, zero for the octave containing -middle C. @var{note} is a number from 0 to 6, with 0 corresponding to C -and 6 corresponding to B. The shift is zero for a natural, negative for -flats, or positive for sharps. - -") -{ - SCM_ASSERT_TYPE(gh_number_p(o), o, SCM_ARG1, __FUNCTION__, "number"); - SCM_ASSERT_TYPE(gh_number_p(n), n, SCM_ARG2, __FUNCTION__, "number"); - SCM_ASSERT_TYPE(gh_number_p(a), a, SCM_ARG3, __FUNCTION__, "number"); - - Pitch p (gh_scm2int (o), gh_scm2int (n), gh_scm2int (a)); - return p.smobbed_copy (); -} - - -LY_DEFINE(pitch_octave, "pitch-octave", 1, 0, 0, - (SCM pp), - "extract the octave from pitch @var{p}.") -{ - Pitch *p = unsmob_pitch (pp); - SCM_ASSERT_TYPE(p, pp, SCM_ARG1, __FUNCTION__, "Pitch"); - int q = p->octave_i (); - - return gh_int2scm (q); -} - -LY_DEFINE(pitch_alteration, "pitch-alteration", 1, 0, 0, - (SCM pp), - "extract the alteration from pitch @var{p}.") -{ - Pitch *p = unsmob_pitch (pp); - SCM_ASSERT_TYPE(p, pp, SCM_ARG1, __FUNCTION__, "Pitch"); - int q = p->alteration_i (); - - return gh_int2scm (q); -} - -LY_DEFINE(pitch_notename, "pitch-notename", 1, 0, 0, - (SCM pp), - "extract the note name from pitch @var{pp}.") +int +Pitch::get_octave () const { - Pitch *p = unsmob_pitch (pp); - SCM_ASSERT_TYPE(p, pp, SCM_ARG1, __FUNCTION__, "Pitch"); - int q = p->notename_i (); - - return gh_int2scm (q); + return octave_; } -LY_DEFINE(pitch_semitones, "pitch-semitones", 1, 0, 0, - (SCM pp), - "calculate the number of semitones of @var{p} from central C.") +int +Pitch::get_notename () const { - Pitch *p = unsmob_pitch (pp); - SCM_ASSERT_TYPE(p, pp, SCM_ARG1, __FUNCTION__, "Pitch"); - - int q = p->steps (); - - return gh_int2scm (q); + return notename_; } -LY_DEFINE(pitch_less, "pitchsmobbed_self (); + Pitch p = *this; + p.transpose (d); + return p; } -int -Pitch::octave_i ()const +Pitch +Pitch::normalized () const { - return octave_i_; + Pitch p = *this; + p.normalize (); + return p; } -int -Pitch::notename_i () const -{ - return notename_i_; -} +Rational NATURAL_ALTERATION (0); +Rational FLAT_ALTERATION (-1, 2); +Rational DOUBLE_FLAT_ALTERATION (-1); +Rational SHARP_ALTERATION (1, 2); -int -Pitch::alteration_i () const +Pitch +Pitch::negated () const { - return alteration_i_; + return pitch_interval (*this, Pitch ()); } -