X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch.cc;h=c0a24f47b2b3a0fb79b067c0deb84c7cddf2d152;hb=afa98722d22b2cc4c98254ff05c9ee164cf98bae;hp=3504bdae6f962dce1e6011e3d35f9cc5e71f7151;hpb=332da9f4d25f9f63a3222efc87fae06b0c7abbdd;p=lilypond.git diff --git a/lily/pitch.cc b/lily/pitch.cc index 3504bdae6f..c0a24f47b2 100644 --- a/lily/pitch.cc +++ b/lily/pitch.cc @@ -1,40 +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--2006 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 (); } /* 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; @@ -42,75 +46,69 @@ 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_tones_.size (); } -/* Should be settable from input? */ -static Byte diatonic_scale_semitones[ ] = { 0, 2, 4, 5, 7, 9, 11 }; - - -/* Calculate pitch height in 12th octave steps. Don't assume - normalised pitch as this function is used to normalise the pitch. */ -int -Pitch::semitone_pitch () const +Rational +Pitch::tone_pitch () const { int o = octave_; int n = notename_; while (n < 0) { - n += 7; - o --; + n += scale_->step_tones_.size (); + o--; } - if (alteration_ % 2) - programming_error ("semitone_pitch () called on quarter tone alteration."); + Rational tones ((o + n / scale_->step_tones_.size ()) * 6, 1); + tones += scale_->step_tones_[n % scale_->step_tones_.size ()]; - return ((o + n / 7) * 12 - + diatonic_scale_semitones[n % 7] - + (alteration_ / 2)); + tones += alteration_; + + return tones; } +/* Calculate pitch height in 12th octave steps. Don't assume + normalized pitch as this function is used to normalize the pitch. */ int -Pitch::quartertone_pitch () const +Pitch::rounded_semitone_pitch () const { - int o = octave_; - int n = notename_; - while (n < 0) - { - n += 7; - o --; - } + return int (double (tone_pitch () * Rational (2))); +} - return ((o + n / 7) * 24 - + 2 * diatonic_scale_semitones[n % 7] - + alteration_); +int +Pitch::rounded_quartertone_pitch () const +{ + return int (double (tone_pitch () * Rational (4))); } void -Pitch::normalise () +Pitch::normalize () { - int pitch = quartertone_pitch (); - while (notename_ >= 7) + Rational pitch = tone_pitch (); + while (notename_ >= (int) scale_->step_tones_.size ()) { - notename_ -= 7; + notename_ -= scale_->step_tones_.size (); octave_++; - alteration_ -= quartertone_pitch () - pitch; + alteration_ -= tone_pitch () - pitch; } while (notename_ < 0) { - notename_ += 7; + notename_ += scale_->step_tones_.size (); octave_--; - alteration_ -= quartertone_pitch () - pitch; + alteration_ -= tone_pitch () - pitch; } - while (alteration_ > DOUBLE_SHARP) + + while (alteration_ > Rational (1)) { - if (notename_ == 6) + if (notename_ == int (scale_->step_tones_.size ())) { notename_ = 0; octave_++; @@ -118,63 +116,62 @@ Pitch::normalise () else notename_++; - alteration_ = 0; - alteration_ -= quartertone_pitch () - pitch; + alteration_ = Rational (0); + alteration_ -= tone_pitch () - pitch; } - - while (alteration_ < DOUBLE_FLAT) + while (alteration_ < Rational(-1)) { if (notename_ == 0) { - notename_ = 6; + notename_ = scale_->step_tones_.size (); octave_--; } else notename_--; alteration_ = 0; - alteration_ -= quartertone_pitch () - pitch; + alteration_ -= tone_pitch () - pitch; } } -/* 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 (); } 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_tones_.size (); + 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; @@ -197,7 +194,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); @@ -223,7 +220,7 @@ Pitch::up_to (int notename) { if (notename_ > notename) octave_++; - notename_ = notename; + notename_ = notename; } void @@ -234,24 +231,12 @@ Pitch::down_to (int notename) notename_ = notename; } -LY_DEFINE (ly_pitch_transpose, "ly:pitch-transpose", - 2, 0, 0, (SCM p, SCM delta), - "Transpose @var{p} by the amount @var{delta}, " - "where @var{delta} is relative to middle C.") -{ - 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"); - return t->transposed (*d).smobbed_copy (); -} - 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); @@ -260,13 +245,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); @@ -291,113 +276,6 @@ Pitch::less_p (SCM p1, SCM p2) return SCM_BOOL_F; } -/* Should add optional args. */ -LY_DEFINE (ly_make_pitch, "ly:make-pitch", - 3, 0, 0, (SCM octave, SCM note, SCM alter), - "@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 @var{alter} is zero for a natural, negative for " - "flats, or positive for sharps. ") -{ - SCM_ASSERT_TYPE (scm_integer_p (octave)== SCM_BOOL_T , octave, SCM_ARG1, __FUNCTION__, "integer"); - SCM_ASSERT_TYPE (scm_integer_p (note)== SCM_BOOL_T, note, SCM_ARG2, __FUNCTION__, "integer"); - SCM_ASSERT_TYPE (scm_integer_p (alter)== SCM_BOOL_T, alter, SCM_ARG3, __FUNCTION__, "integer"); - - Pitch p (scm_to_int (octave), scm_to_int (note), scm_to_int (alter)); - return p.smobbed_copy (); -} - -LY_DEFINE (ly_pitch_steps, "ly:pitch-steps", 1, 0, 0, - (SCM p), - "Number of steps counted from middle C of the pitch @var{p}.") -{ - Pitch *pp = unsmob_pitch (p); - SCM_ASSERT_TYPE (pp, p, SCM_ARG1, __FUNCTION__, "Pitch"); - return scm_int2num (pp->steps ()); -} - -LY_DEFINE (ly_pitch_octave, "ly: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->get_octave (); - return scm_int2num (q); -} - -LY_DEFINE (ly_pitch_alteration, "ly: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->get_alteration (); - - return scm_int2num (q); -} - -LY_DEFINE (pitch_notename, "ly:pitch-notename", - 1, 0, 0, (SCM pp), - "Extract the note name from pitch @var{pp}.") -{ - Pitch *p = unsmob_pitch (pp); - SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch"); - int q = p->get_notename (); - return scm_int2num (q); -} - -LY_DEFINE (ly_pitch_quartertones, "ly:pitch-quartertones", - 1, 0, 0, (SCM pp), - "Calculate the number of quarter tones of @var{p} from middle C.") -{ - Pitch *p = unsmob_pitch (pp); - SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch"); - int q = p->quartertone_pitch (); - return scm_int2num (q); -} - -LY_DEFINE (ly_pitch_semitones, "ly:pitch-semitones", - 1, 0, 0, (SCM pp), - "calculate the number of semitones of @var{p} from middle C.") -{ - Pitch *p = unsmob_pitch (pp); - SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch"); - int q = p->semitone_pitch (); - return scm_int2num (q); -} - -LY_DEFINE (ly_pitch_less_p, "ly:pitch