X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscale.cc;h=02c1dc5f8e2daca09b480ac977049c66e70d68e3;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=83ee6600ba115d231393650039a41e43d88df1ab;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git diff --git a/lily/scale.cc b/lily/scale.cc index 83ee6600ba..02c1dc5f8e 100644 --- a/lily/scale.cc +++ b/lily/scale.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2006--2010 Han-Wen Nienhuys + Copyright (C) 2006--2015 Han-Wen Nienhuys 2007--2008 Rune Zedeler 2008 Joe Neeman @@ -20,79 +20,73 @@ */ #include "scale.hh" +#include "protected-scm.hh" -#include "ly-smobs.icc" /* todo: put string <-> pitch here too. - */ LY_DEFINE (ly_make_scale, "ly:make-scale", - 1, 0, 0, (SCM steps), - "Create a scale." - " The argument is a vector of rational numbers, each of which" - " represents the number of 200 cent tones of a pitch above the" - " tonic.") + 1, 0, 0, (SCM steps), + "Create a scale." + " The argument is a vector of rational numbers, each of which" + " represents the number of 200 cent tones of a pitch above the" + " tonic.") { bool type_ok = scm_is_vector (steps); - vector tones; + vector tones; if (type_ok) { int len = scm_c_vector_length (steps); - for (int i = 0 ; i < len; i++) - { - SCM step = scm_c_vector_ref (steps, i); - type_ok = type_ok && scm_is_rational (step); - if (type_ok) - { - Rational from_c (scm_to_int (scm_numerator (step)), - scm_to_int (scm_denominator (step))); - tones.push_back (from_c); - } - } + for (int i = 0; i < len; i++) + { + SCM step = scm_c_vector_ref (steps, i); + type_ok = type_ok && scm_is_rational (step); + if (type_ok) + { + Rational from_c (scm_to_int (scm_numerator (step)), + scm_to_int (scm_denominator (step))); + tones.push_back (from_c); + } + } } - - - SCM_ASSERT_TYPE (type_ok, steps, SCM_ARG1, __FUNCTION__, "vector of rational"); - Scale *s = new Scale (tones); + SCM_ASSERT_TYPE (type_ok, steps, SCM_ARG1, __FUNCTION__, "vector of rational"); - SCM retval = s->self_scm (); - s->unprotect (); - - return retval; + return (new Scale (tones))->unprotect (); } +Scale *default_global_scale = 0; +Protected_scm default_global_scale_scm (SCM_BOOL_F); + +// TODO: This is somewhat fishy: pitches protect their scale via a +// mark_smob hook. But since pitches are of Simple_smob variety, they +// are unknown to GUILE unless a smobbed_copy has been created. So +// changing the default scale might cause some existing pitches to +// lose their scale's protection. + LY_DEFINE (ly_default_scale, "ly:default-scale", - 0, 0, 0, (), - "Get the global default scale.") + 0, 0, 0, (), + "Get the global default scale.") { - return default_global_scale - ? default_global_scale->self_scm () - : SCM_BOOL_F; + return default_global_scale_scm; } - -Scale * default_global_scale = 0; - LY_DEFINE (ly_set_default_scale, "ly:set-default-scale", - 1, 0, 0, (SCM scale), - "Set the global default scale. This determines the tuning of" - " pitches with no accidentals or key signatures. The first" - " pitch is C. Alterations are calculated relative to this" - " scale. The number of pitches in this scale determines the" - " number of scale steps that make up an octave. Usually the" - " 7-note major scale.") + 1, 0, 0, (SCM scale), + "Set the global default scale. This determines the tuning of" + " pitches with no accidentals or key signatures. The first" + " pitch is C. Alterations are calculated relative to this" + " scale. The number of pitches in this scale determines the" + " number of scale steps that make up an octave. Usually the" + " 7-note major scale.") { LY_ASSERT_SMOB (Scale, scale, 1); - Scale *s = Scale::unsmob (scale); - if (default_global_scale) - default_global_scale->unprotect (); - default_global_scale = s; - s->protect (); - + default_global_scale_scm = scale; + default_global_scale = unsmob (scale); + return SCM_UNSPECIFIED; } @@ -110,7 +104,7 @@ Scale::tones_at_step (int step, int octave) const octave += (step - normalized_step) / step_count (); // There are 6 tones in an octave. - return step_tones_[normalized_step] + Rational (octave*6); + return step_tones_[normalized_step] + Rational (octave * 6); } Rational @@ -122,7 +116,7 @@ Scale::step_size (int step) const // scale (6 is the number of tones of the octave above the // first note). if (normalized_step + 1 == step_count ()) - return Rational(6) - step_tones_[normalized_step]; + return Rational (6) - step_tones_[normalized_step]; return step_tones_[normalized_step + 1] - step_tones_[normalized_step]; } @@ -137,20 +131,7 @@ Scale::normalize_step (int step) const return ret; } -int -Scale::print_smob (SCM /* x */, - SCM port, - scm_print_state *) -{ - scm_puts ("#", port); - return 1; -} -SCM -Scale::mark_smob (SCM) -{ - return SCM_UNSPECIFIED; -} Scale::Scale (vector const &tones) { @@ -160,15 +141,12 @@ Scale::Scale (vector const &tones) } Scale::Scale (Scale const &src) + : Smob () { step_tones_ = src.step_tones_; smobify_self (); } - Scale::~Scale () { } - -IMPLEMENT_SMOBS (Scale); -IMPLEMENT_DEFAULT_EQUAL_P (Scale);