release: 0.0.49

[lilypond.git] / lily / key.cc

diff --git a/lily/key.cc b/lily/key.cc
index 7e23464ccfec917464e06d63eeaad6f3219dca28..0f02ef845d0d3b4a9d854233ae2ec726531f1bb9 100644 (file)
--- a/lily/key.cc
+++ b/lily/key.cc
@@ -3,36 +3,47 @@
 const int OCTAVES=14;          // ugh..
 const int ZEROOCTAVE=7;
 
-Key::Key()
+Octave_key::Octave_key()
 {
     accidental_i_arr_.set_size(7);
     for (int i= 0; i < 7 ; i++)
        accidental_i_arr_[i] = 0;
 }
 
-Local_key::Local_key()
+Key::Key()
 {
+    multi_octave_b_ = false;
     octaves.set_size(OCTAVES);
 }
 
-Key&
-Local_key::oct(int i)
+Octave_key&
+Key::oct(int i)
+{
+    return octaves[i+ZEROOCTAVE];    
+}
+
+Octave_key
+Key::oct(int i)const
 {
     return octaves[i+ZEROOCTAVE];    
 }
 
 void
-Key::set(int i, int a)
+Octave_key::set(int i, int a)
 {
     assert(a > -3 && a < 3);
     accidental_i_arr_[i]=a;    
 }
 
+void
+Key::set(int o, int n , int a)
+{
+    octaves[o + ZEROOCTAVE].set(n,a);
+}
 
 void
-Local_key::reset(Key k)
+Key::set (int n, int a)
 {
     for (int i= 0; i < OCTAVES ; i++)
-       octaves[i] = k;
+       octaves[i].set(n,a);
 }
-