patch::: 1.3.33.jcn3

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

diff --git a/lily/include/musical-pitch.hh b/lily/include/musical-pitch.hh
index 7a5fd5b5b129b1c8ffd98dc20a23bd257c6bf70d..7bc94b499f17562670dd47232c3d7c0f1f04cec1 100644 (file)
--- a/lily/include/musical-pitch.hh
+++ b/lily/include/musical-pitch.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -12,6 +12,7 @@
 
 #include "lily-proto.hh"
 #include "input.hh"
+#include "lily-guile.hh" // we need SCM
 
 /** 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
@@ -21,7 +22,7 @@
 */
 struct Musical_pitch : public Input
 {
-  Musical_pitch (int notename=0, int accidental=0, int octave=0, bool cautionary=false);
+  Musical_pitch (int notename=0, int accidental=0, int octave=0);
 
   /// 0 is c, 6 is b
   int notename_i_;
@@ -29,8 +30,6 @@ struct Musical_pitch : public Input
   int accidental_i_;
   /// 0 is central c
   int octave_i_;
-  /// Used for cautionary accidentals
-  bool cautionary_b_;
 
   Musical_pitch to_relative_octave (Musical_pitch);
   void transpose (Musical_pitch);
@@ -45,6 +44,9 @@ struct Musical_pitch : public Input
   void print () const;
 };
 
+SCM to_scm (Musical_pitch p);
+Musical_pitch scm_to (SCM s, Musical_pitch* p);
+
 #include "compare.hh"
 INSTANTIATE_COMPARE(Musical_pitch, Musical_pitch::compare);