X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch.cc;h=8b4ace156766cf278752d43a3dd830bc9e212675;hb=72c639c7ba83e2550cc2dbb0f0d1914563220e61;hp=8e8cd0ebfddb38e3c1f6dad734968c9ceca15478;hpb=1e1fa5221ca359326b073626168c6b7cda6453e1;p=lilypond.git diff --git a/lily/pitch.cc b/lily/pitch.cc index 8e8cd0ebfd..8b4ace1567 100644 --- a/lily/pitch.cc +++ b/lily/pitch.cc @@ -1,16 +1,16 @@ /* - 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--2005 Han-Wen Nienhuys */ #include "pitch.hh" #include "warn.hh" #include "main.hh" -#include "ly-smobs.icc" +#include "ly-smobs.icc" Pitch::Pitch (int o, int n, int a) { @@ -31,7 +31,7 @@ Pitch::Pitch () 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_; @@ -47,12 +47,11 @@ Pitch::compare (Pitch const &m1, Pitch const &m2) int Pitch::steps () const { - return notename_ + octave_*7; + return notename_ + octave_ * 7; } /* Should be settable from input? */ -static Byte diatonic_scale_semitones[ ] = { 0, 2, 4, 5, 7, 9, 11 }; - +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. */ @@ -64,7 +63,7 @@ Pitch::semitone_pitch () const while (n < 0) { n += 7; - o --; + o--; } if (alteration_ % 2) @@ -83,7 +82,7 @@ Pitch::quartertone_pitch () const while (n < 0) { n += 7; - o --; + o--; } return ((o + n / 7) * 24 @@ -140,7 +139,7 @@ Pitch::normalise () void Pitch::transpose (Pitch delta) { - int new_semi = quartertone_pitch () +delta.quartertone_pitch (); + int new_semi = quartertone_pitch () +delta.quartertone_pitch (); octave_ += delta.octave_; notename_ += delta.notename_; alteration_ += new_semi - quartertone_pitch (); @@ -149,22 +148,21 @@ Pitch::transpose (Pitch delta) } Pitch -interval (Pitch const & from , Pitch const & to ) +pitch_interval (Pitch const &from, Pitch const &to) { - int sound = to.quartertone_pitch () - from.quartertone_pitch (); + int sound = to.quartertone_pitch () - from.quartertone_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.quartertone_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 Pitch::to_string () const @@ -196,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); @@ -222,7 +220,7 @@ Pitch::up_to (int notename) { if (notename_ > notename) octave_++; - notename_ = notename; + notename_ = notename; } void @@ -233,18 +231,6 @@ 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 @@ -257,7 +243,7 @@ IMPLEMENT_SIMPLE_SMOBS (Pitch); int Pitch::print_smob (SCM s, SCM port, scm_print_state *) { - Pitch *r = (Pitch *) scm_cdr (s); + Pitch *r = (Pitch *) SCM_CELL_WORD_1 (s); scm_puts ("#to_string ().to_str0 ()), port); scm_puts (" >", port); @@ -265,10 +251,10 @@ Pitch::print_smob (SCM s, SCM port, scm_print_state *) } SCM -Pitch::equal_p (SCM a , SCM b) +Pitch::equal_p (SCM a, SCM b) { - Pitch *p = (Pitch *) scm_cdr (a); - Pitch *q = (Pitch *) scm_cdr (b); + Pitch *p = (Pitch *) SCM_CELL_WORD_1 (a); + Pitch *q = (Pitch *) SCM_CELL_WORD_1 (b); bool eq = p->notename_ == q->notename_ && p->octave_ == q->octave_ @@ -290,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