release: 1.1.51

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

diff --git a/lily/include/key.hh b/lily/include/key.hh
index 5875f84e6bfdef49aed1cfa02922b6f33a0d67f4..140db77927ed3a39b361b3edb138569d300d0783 100644 (file)
--- a/lily/include/key.hh
+++ b/lily/include/key.hh
@@ -1,14 +1,15 @@
 /*
   key.hh -- declare Key, Octave_key
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--1999 Han-Wen Nienhuys
 */
 
 #ifndef KEY_HH
 #define KEY_HH
 
-#include "varray.hh"
+#include "array.hh"
 #include "scalar.hh"
+#include "lily-proto.hh"
 
 /// administration of current key in one octave.
 class Octave_key {
@@ -33,9 +34,12 @@ public:
   bool multi_octave_b_;
   
   void clear ();
-  Octave_key&oct (int);
+  Octave_key const& oct (int) const;
   void set (int name, int acc);
-  void set (int oct, int name, int acc);
+  void set (Musical_pitch);
+
+  bool different_acc (Musical_pitch) const;
+  
   Key();
   void print () const;  
 };