# HG changeset patch
# User Marcus Pearce <m.pearce@gold.ac.uk>
# Date 1185459580 -3600
# Node ID ea542c06c364a77a0e17dd35108e799223d61f94
# Parent  a9a1c7aa86a91d2a24068229c214fa49dadd52e1
implementations/mtp: update to reflect refactoring of diatonic pitch

darcs-hash:20070726141940-c0ce4-2c511298f961f5d2c6ca8beb41c11516fb305de9.gz

diff -r a9a1c7aa86a9 -r ea542c06c364 implementations/mtp/methods.lisp
--- a/implementations/mtp/methods.lisp	Thu Jul 26 14:18:34 2007 +0100
+++ b/implementations/mtp/methods.lisp	Thu Jul 26 15:19:40 2007 +0100
@@ -250,19 +250,20 @@
 (defmethod midi-pitch-number ((e mtp-event))
   (%mtp-cpitch e))
 
-(defmethod meredith-morphetic-pitch-number ((e mtp-event))
+(defmethod diatonic-pitch-cp ((e mtp-event))
+  ;; MIPS morphetic pitch is relative to An0 while cpitch is relative to Cn2
+  (- (%mtp-cpitch e) 21))
+
+(defmethod diatonic-pitch-mp ((e mtp-event))
   ;; MIPS morphetic pitch is relative to An0 while mpitch is relative to Cn2
   (- (%mtp-mpitch e) 12))
 
-(defmethod mips-pitch ((e mtp-event))
-  (make-mips-pitch (meredith-chromatic-pitch-number e)
-                   (meredith-morphetic-pitch-number e)))
-
 (defmethod diatonic-pitch ((e mtp-event))
-  (diatonic-pitch (mips-pitch e)))
+  (make-mips-pitch (diatonic-pitch-cp e)
+                   (diatonic-pitch-mp e)))
 
 (defmethod asa-pitch-string ((e mtp-event))
-  (asa-pitch-string (mips-pitch e)))
+  (asa-pitch-string (diatonic-pitch e)))
 
 #.(clsql:locally-enable-sql-reader-syntax)
 (defmethod middle-c ((e mtp-event))