X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpitch.hh;h=e711fc0d579b138b91355414bf3b91d3e8134d4c;hb=95e5705d0697eac20246352d416f14b6d92485f5;hp=f5cfa19ed08cee9e9abffacc7421479de8ac56e3;hpb=0d4a3f8b85484d352a128ace42efd297dbb1bc37;p=lilypond.git

diff --git a/lily/include/pitch.hh b/lily/include/pitch.hh
index f5cfa19ed0..e711fc0d57 100644
--- a/lily/include/pitch.hh
+++ b/lily/include/pitch.hh
@@ -1,83 +1,96 @@
-/*   
+/*
   pitch.hh -- declare Pitch
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef MUSICAL_PITCH_HH
 #define MUSICAL_PITCH_HH
 
 #include "lily-proto.hh"
 #include "smobs.hh"
+#include "rational.hh"
+
+
+/** 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.
+
+    Pitch is lexicographically ordered by (octave, notename,
+    alteration).
 
-/** A "tonal" pitch. This is a pitch as it figures in diatonal western
-   music (12 semitones in an octave), as opposed to a frequence in Hz
-   or a integer number of semitones.
-   
 */
 class Pitch
 {
-public:				// fixme
-  /*
-    TODO: use SCM -- (make private?)
-   */
-
-    /// 0 is c, 6 is b
-  int notename_i_;
-  
-  /// 0 natural, 1 sharp, etc
-  int alteration_i_;
-
-  /// 0 is central c
-  int octave_i_;
-  /*
-    mutators, so JUNKME.
-   */
+private:
+  int octave_;
+  int notename_;
+  Rational alteration_;
+  Scale *scale_;
+
   void transpose (Pitch);
   void up_to (int);
   void down_to (int);
+  void normalize ();
 
 public:
+  int get_octave () const;
+  int get_notename () const;
+  Rational get_alteration () const;
 
-  int octave_i () const;
-  int notename_i () const;
-  int alteration_i () const;
-
-  /*
-    Pitch is lexicographically ordered by (octave, notename,
-    alteration).    
-   */
-  Pitch (int octave, int notename,int accidental);
+  Pitch (int octave, int notename, Rational accidental);
+  Pitch (int octave, int notename);
   Pitch ();
 
-  Pitch to_relative_octave (Pitch);
+  Pitch transposed (Pitch) const;
+  Pitch to_relative_octave (Pitch) const;
 
-  static int compare (Pitch const&,Pitch const&);
-  /// return large part of interval from central c
-  int steps() const;
-  /// return pitch from central c (in halfnotes)
-  int semitone_pitch() const; 
-  String str () const;
+  static int compare (Pitch const &, Pitch const &);
 
-  static SCM transpose (SCM p, SCM delta);
+  int steps () const;
+  Rational tone_pitch () const;
+  int rounded_semitone_pitch () const;
+  int rounded_quartertone_pitch () const;
+  Pitch negated () const;
+  string to_string () const;
 
-  SCM smobbed_copy () const;
-  DECLARE_SCHEME_CALLBACK(less_p, (SCM a, SCM b));
-  DECLARE_SIMPLE_SMOBS(Pitch,);
+  DECLARE_SCHEME_CALLBACK (less_p, (SCM a, SCM b));
+  DECLARE_SIMPLE_SMOBS (Pitch);
+};
 
 
+enum {
+  DOUBLE_FLAT = -4,
+  THREE_Q_FLAT,
+  FLAT,
+  SEMI_FLAT,
+  NATURAL,
+  SEMI_SHARP,
+  SHARP,
+  THREE_Q_SHARP,
+  DOUBLE_SHARP,
 };
 
-Pitch* unsmob_pitch (SCM);
+extern Rational  DOUBLE_FLAT_ALTERATION;
+extern Rational  THREE_Q_FLAT_ALTERATION;
+extern Rational  FLAT_ALTERATION;
+extern Rational  SEMI_FLAT_ALTERATION;
+extern Rational  NATURAL_ALTERATION;
+extern Rational  SEMI_SHARP_ALTERATION;
+extern Rational  SHARP_ALTERATION;
+extern Rational  THREE_Q_SHARP_ALTERATION;
+extern Rational  DOUBLE_SHARP_ALTERATION;
 
-#include "compare.hh"
-INSTANTIATE_COMPARE(Pitch, Pitch::compare);
+SCM ly_pitch_diff (SCM pitch, SCM root);
+SCM ly_pitch_transpose (SCM p, SCM delta);
+DECLARE_UNSMOB (Pitch, pitch);
 
-int compare (Array<Pitch>*, Array<Pitch>*);
+INSTANTIATE_COMPARE (Pitch, Pitch::compare);
 
-#endif /* MUSICAL_PITCH_HH */
+extern SCM pitch_less_proc;
+Pitch pitch_interval (Pitch const &from, Pitch const &to);
 
+#endif /* MUSICAL_PITCH_HH */