X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch.cc;h=90d50d46e2ff43bafeeb90136f8f81ec55ce1251;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=556df4b282d761dc4c4b6206726c104b3342624b;hpb=eea589c2d7bee6ab38bc611eb205d4c74e2011f7;p=lilypond.git diff --git a/lily/pitch.cc b/lily/pitch.cc index 556df4b282..90d50d46e2 100644 --- a/lily/pitch.cc +++ b/lily/pitch.cc @@ -1,39 +1,44 @@ /* - musical-pitch.cc -- implement Pitch + musical-pitch.cc -- implement Pitch source file of the GNU LilyPond music typesetter - (c) 1998--2004 Han-Wen Nienhuys + (c) 1998--2008 Han-Wen Nienhuys */ #include "pitch.hh" -#include "warn.hh" + #include "main.hh" +#include "scale.hh" +#include "string-convert.hh" +#include "warn.hh" #include "ly-smobs.icc" -Pitch::Pitch (int o, int n, int a) + +Pitch::Pitch (int o, int n, Rational a) { notename_ = n; alteration_ = a; octave_ = o; - normalise (); + scale_ = default_global_scale; + normalize_octave (); } /* FIXME: why is octave == 0 and default not middleC ? */ Pitch::Pitch () { notename_ = 0; - alteration_ = 0; + scale_ = default_global_scale; octave_ = 0; } int Pitch::compare (Pitch const &m1, Pitch const &m2) { - int o = m1.octave_ - m2.octave_; + int o = m1.octave_ - m2.octave_; int n = m1.notename_ - m2.notename_; - int a = m1.alteration_ - m2.alteration_; + Rational a = m1.alteration_ - m2.alteration_; if (o) return o; @@ -41,139 +46,107 @@ Pitch::compare (Pitch const &m1, Pitch const &m2) return n; if (a) return a; + return 0; } int Pitch::steps () const { - return notename_ + octave_*7; + return notename_ + octave_ * scale_->step_count (); } -/* Should be settable from input? */ -static Byte diatonic_scale_semitones[ ] = { 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_; - int n = notename_; - while (n < 0) - { - n += 7; - o --; - } - - if (alteration_ % 2) - programming_error ("semitone_pitch () called on quarter tone alteration."); - - return ((o + n / 7) * 12 - + diatonic_scale_semitones[n % 7] - + (alteration_ / 2)); + return int (double (tone_pitch () * Rational (2))); } int -Pitch::quartertone_pitch () const +Pitch::rounded_quartertone_pitch () const { - int o = octave_; - int n = notename_; - while (n < 0) - { - n += 7; - o --; - } + return int (double (tone_pitch () * Rational (4))); +} - return ((o + n / 7) * 24 - + 2 * diatonic_scale_semitones[n % 7] - + alteration_); +void +Pitch::normalize_octave () +{ + 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::normalise () +Pitch::normalize_alteration () { - int pitch = quartertone_pitch (); - while (notename_ >= 7) - { - notename_ -= 7; - octave_++; - alteration_ -= quartertone_pitch () - pitch; - } - while (notename_ < 0) + while (alteration_ > Rational (1)) { - notename_ += 7; - octave_--; - alteration_ -= quartertone_pitch () - pitch; + alteration_ -= scale_->step_size (notename_); + notename_++; } - while (alteration_ > DOUBLE_SHARP) + while (alteration_ < Rational (-1)) { - if (notename_ == 6) - { - notename_ = 0; - octave_++; - } - else - notename_++; - - alteration_ = 0; - alteration_ -= quartertone_pitch () - pitch; + notename_--; + alteration_ += scale_->step_size (notename_); } +} - while (alteration_ < DOUBLE_FLAT) - { - if (notename_ == 0) - { - notename_ = 6; - octave_--; - } - else - notename_--; - - alteration_ = 0; - alteration_ -= quartertone_pitch () - pitch; - } +void +Pitch::normalize () +{ + normalize_alteration (); + normalize_octave (); } -/* WHugh, wat een intervaas */ void Pitch::transpose (Pitch delta) { - int new_semi = quartertone_pitch () +delta.quartertone_pitch (); + Rational new_alter = tone_pitch () + delta.tone_pitch (); + octave_ += delta.octave_; notename_ += delta.notename_; - alteration_ += new_semi - quartertone_pitch (); + alteration_ += new_alter - tone_pitch (); - normalise (); + normalize_octave (); } Pitch -pitch_interval (Pitch const & from , Pitch const & to ) +pitch_interval (Pitch const &from, Pitch const &to) { - int sound = to.quartertone_pitch () - from.quartertone_pitch (); + 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.quartertone_pitch ())); + return pt.transposed (Pitch (0, 0, sound - pt.tone_pitch ())); } - /* FIXME Merge with *pitch->text* funcs in chord-name.scm */ char const *accname[] = {"eses", "eseh", "es", "eh", "", - "ih", "is" , "isih", "isis"}; + "ih", "is", "isih", "isis"}; -String +string Pitch::to_string () const { - int n = (notename_ + 2) % 7; - String s = ::to_string (char (n + 'a')); - if (alteration_) - s += String (accname[alteration_ - DOUBLE_FLAT]); - + 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))); + + s += string (accname[qt + 4]); if (octave_ >= 0) { int o = octave_ + 1; @@ -196,7 +169,7 @@ Pitch Pitch::to_relative_octave (Pitch p) const { /* account for c' = octave 1 iso. 0 4 */ - int oct_mod = octave_ + 1; + int oct_mod = octave_ + 1; Pitch up_pitch (p); Pitch down_pitch (p); @@ -222,7 +195,7 @@ Pitch::up_to (int notename) { if (notename_ > notename) octave_++; - notename_ = notename; + notename_ = notename; } void @@ -234,11 +207,11 @@ Pitch::down_to (int notename) } 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); @@ -247,13 +220,13 @@ Pitch::print_smob (SCM s, SCM port, scm_print_state *) { Pitch *r = (Pitch *) SCM_CELL_WORD_1 (s); scm_puts ("#to_string ().to_str0 ()), 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 *) SCM_CELL_WORD_1 (a); Pitch *q = (Pitch *) SCM_CELL_WORD_1 (b); @@ -265,7 +238,6 @@ Pitch::equal_p (SCM a , SCM b) return eq ? SCM_BOOL_T : SCM_BOOL_F; } - MAKE_SCHEME_CALLBACK (Pitch, less_p, 2); SCM Pitch::less_p (SCM p1, SCM p2) @@ -279,7 +251,6 @@ Pitch::less_p (SCM p1, SCM p2) return SCM_BOOL_F; } - int Pitch::get_octave () const { @@ -292,7 +263,7 @@ Pitch::get_notename () const return notename_; } -int +Rational Pitch::get_alteration () const { return alteration_; @@ -305,3 +276,14 @@ Pitch::transposed (Pitch d) const p.transpose (d); return p; } + +Rational NATURAL_ALTERATION (0); +Rational FLAT_ALTERATION (-1, 2); +Rational DOUBLE_FLAT_ALTERATION (-1); +Rational SHARP_ALTERATION (1, 2); + +Pitch +Pitch::negated () const +{ + return pitch_interval (*this, Pitch ()); +}