*** empty log message ***

[lilypond.git] / lily / include / pitch.hh

diff --git a/lily/include/pitch.hh b/lily/include/pitch.hh
index df191b9b69ca3d4dbb3cffc4841c7d73a1f064c4..8be2dc3404db55d531e44101c48c97bedc83d056 100644 (file)
--- a/lily/include/pitch.hh
+++ b/lily/include/pitch.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c)  1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -48,22 +48,21 @@ public:
   int get_notename () const;
   int get_alteration () const;
 
-  Pitch (int octave, int notename,int accidental);
+  Pitch (int octave, int notename, int accidental);
   Pitch ();
 
   Pitch transposed (Pitch) const;
   Pitch to_relative_octave (Pitch) const;
 
-  static int compare (Pitch const&,Pitch const&);
+  static int compare (Pitch const&, Pitch const&);
 
   int steps () const;
   int semitone_pitch () const; 
   int quartertone_pitch () const; 
   String to_string () const;
 
-  SCM smobbed_copy () const;
   DECLARE_SCHEME_CALLBACK (less_p, (SCM a, SCM b));
-  DECLARE_SIMPLE_SMOBS (Pitch,);
+  DECLARE_SIMPLE_SMOBS (Pitch, );
 };
 
 enum {
@@ -78,15 +77,15 @@ enum {
   DOUBLE_SHARP,
 };
 
+SCM ly_pitch_diff (SCM pitch, SCM  root);
 SCM ly_pitch_transpose (SCM p, SCM delta);
-DECLARE_UNSMOB(Pitch,pitch);
+DECLARE_UNSMOB(Pitch, pitch);
 
-#include "compare.hh"
 INSTANTIATE_COMPARE (Pitch, Pitch::compare);
 
 int compare (Array<Pitch>*, Array<Pitch>*);
 extern SCM pitch_less_proc;
-Pitch interval (Pitch const & from , Pitch const & to );
+Pitch pitch_interval (Pitch const & from , Pitch const & to );
 
 #endif /* MUSICAL_PITCH_HH */