diff base/methods.lisp @ 34:81b4228e26f5

Primarily corrections to large push earlier, including one missed file

darcs-hash:20070418135009-f76cc-011412bf4b5a6bb20bd43b41a8a145f69e941926.gz

--- a/base/methods.lisp	Fri Apr 13 11:09:09 2007 +0100
+++ b/base/methods.lisp	Wed Apr 18 14:50:09 2007 +0100
@@ -113,7 +113,7 @@
 (defmethod pitch+ ((object1 pitch-designator)
 		   (object2 pitch-interval)) ; or should I check the
 					     ; pitch/interval types?
-  (make-chromatic-pitch (+ (chromatic-pitch object1)
+  (make-chromatic-pitch (+ (midi-pitch-number object1)
 			   (span object2))))
 
 (defmethod pitch+  ((object1 pitch-interval)
@@ -127,12 +127,12 @@
 
 (defmethod pitch- ((object1 pitch-designator)
 		   (object2 pitch-designator))
-  (make-pitch-interval (- (chromatic-pitch object1)
-			  (chromatic-pitch object2))))
+  (make-pitch-interval (- (midi-pitch-number object1)
+			  (midi-pitch-number object2))))
 
 (defmethod pitch- ((object1 pitch-designator)
 		   (object2 pitch-interval))
-  (make-chromatic-pitch (- (chromatic-pitch object1)
+  (make-chromatic-pitch (- (midi-pitch-number object1)
 			   (span object2))))
 
 (defmethod pitch- ((object1 pitch-interval)
@@ -147,13 +147,13 @@
 
 (defmethod pitch> ((object1 pitch-designator)
 		   (object2 pitch-designator))
-  (> (chromatic-pitch object1)
-     (chromatic-pitch object2)))
+  (> (midi-pitch-number object1)
+     (midi-pitch-number object2)))
 
 (defmethod pitch= ((object1 pitch-designator)
 		   (object2 pitch-designator))
-  (= (chromatic-pitch object1)
-     (chromatic-pitch object2)))
+  (= (midi-pitch-number object1)
+     (midi-pitch-number object2)))
 
 (defmethod interval> ((object1 pitch-interval)
 		   (object2 pitch-interval))