comparison implementations/mtp/methods.lisp @ 329:f54848e1f74c

Flag use of cents; define diatonic-pitch correctly for cents

 (cl:in-package #:amuse-mtp)
+
+;;; Are we using cents to represent chromatc pitch, or MIDI values?
+;;; A hack to allow backwards compatibility with old MIDI value databases.
+(defvar *cpitch-cents* t)
 
 ;;; Compositions 
 
 #.(clsql:locally-enable-sql-reader-syntax)
 

 (defmethod midi-pitch-number ((e mtp-event))
   (%mtp-cpitch e))
 
 (defmethod diatonic-pitch-cp ((e mtp-event))
   ;; MIPS morphetic pitch is relative to An0 while cpitch is relative to Cn2
-  (- (%mtp-cpitch e) 21))
+  ;; Make sure MIDI value is used
+  (- (if  *cpitch-cents* (/ (%mtp-cpitch e) 100) (%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))