X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fpitch.hh;h=91c527455712cb4f6a1f388921d1328fc23d7530;hb=324ff94afc62c7011b7377f24392f95391ed3b84;hp=fca3791ee9d4eacd2d05779afecc92bc7803736d;hpb=492f3643bd2a86956201c3e0c93bb1b65bcdea4e;p=lilypond.git

diff --git a/lily/include/pitch.hh b/lily/include/pitch.hh
index fca3791ee9..91c5274557 100644
--- a/lily/include/pitch.hh
+++ b/lily/include/pitch.hh
@@ -1,85 +1,108 @@
-/*   
-  pitch.hh -- declare Pitch
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#ifndef MUSICAL_PITCH_HH
-#define MUSICAL_PITCH_HH
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1998--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PITCH_HH
+#define 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.
 
-/** 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.
-   
+  Pitch is lexicographically ordered by (octave, notename, alteration).
 */
+
 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_octave ();
+  void normalize_alteration ();
+  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;
-
-  void normalise ();
-  /*
-    Pitch is lexicographically ordered by (octave, notename,
-    alteration).    
-   */
-  Pitch (int octave, int notename,int accidental);
+  Pitch (int octave, int notename, Rational accidental = 0);
   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;
-  
+  Pitch normalized () const;
 
+  static int compare (Pitch const &, Pitch const &);
 
-  SCM smobbed_copy () const;
-  DECLARE_SCHEME_CALLBACK (less_p, (SCM a, SCM b));
-  DECLARE_SIMPLE_SMOBS (Pitch,);
+  int steps () const;
+  Rational tone_pitch () const;
+  int rounded_semitone_pitch () const;
+  int rounded_quartertone_pitch () const;
+  Pitch negated () const;
+  string to_string () const;
 
+  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,
 };
+
+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;
+
+SCM ly_pitch_diff (SCM pitch, SCM root);
 SCM ly_pitch_transpose (SCM p, SCM delta);
-DECLARE_UNSMOB(Pitch,pitch);
 
-#include "compare.hh"
 INSTANTIATE_COMPARE (Pitch, Pitch::compare);
 
-int compare (Array<Pitch>*, Array<Pitch>*);
 extern SCM pitch_less_proc;
+Pitch pitch_interval (Pitch const &from, Pitch const &to);
+extern SCM Pitch_type_p_proc;
 
-#endif /* MUSICAL_PITCH_HH */
-
-
+#endif /* PITCH_HH */