X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpitch.hh;h=57cb076b526fdcfa4566a6408b71e3de30fda551;hb=9f3572d98bb948c9689cd1f75401a029451fa001;hp=2ebbb71a4179ada0835ba590eb20fbd03583aae8;hpb=04265f11d1f21416ccebd2dcaa1d903dc781b36e;p=lilypond.git diff --git a/lily/include/pitch.hh b/lily/include/pitch.hh index 2ebbb71a41..57cb076b52 100644 --- a/lily/include/pitch.hh +++ b/lily/include/pitch.hh @@ -12,17 +12,6 @@ #include "lily-proto.hh" #include "smobs.hh" -#include "std-vector.hh" - -struct Scale -{ - vector step_semitones_; - Scale (); - Scale (Scale const&); - DECLARE_SMOBS(Scale,); -}; - - /** A "tonal" pitch. This is a pitch used in diatonal western music (24 quartertones in an octave), as opposed to a frequency in Hz or a integer number of semitones. @@ -45,8 +34,7 @@ private: // fixme int notename_; int alteration_; int octave_; - Scale *scale_; - + void transpose (Pitch); void up_to (int); void down_to (int); @@ -96,7 +84,6 @@ INSTANTIATE_COMPARE (Pitch, Pitch::compare); extern SCM pitch_less_proc; Pitch pitch_interval (Pitch const &from, Pitch const &to); -extern Scale *default_global_scale; #endif /* MUSICAL_PITCH_HH */