Mercurial > hg > amuse

changeset 68:95dce8c7f08c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
midi-key-signature: 0 darcs-hash:20070706094145-c0ce4-eedb2b03b6557c4dba4cdd1170c925c471744a71.gz
author Marcus Pearce <m.pearce@gold.ac.uk>
date Fri, 06 Jul 2007 10:41:45 +0100
parents 8b31d54c95be
children 873d7546d2fe
files base/classes.lisp implementations/mtp/methods.lisp
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/base/classes.lisp	Fri Jul 06 10:32:28 2007 +0100
+++ b/base/classes.lisp	Fri Jul 06 10:41:45 2007 +0100
@@ -76,8 +76,7 @@
 		:initarg :sharp-count)))
 
 (defclass midi-key-signature (basic-key-signature)
-  ;; Is mode ever used in real life? Is it ever accurately used in
-  ;; real life?
+  ;; mode: 0 = major key; 1 = minor key
   ((mode :accessor %midi-key-signature-mode
 	 :initarg :mode)))
 
--- a/implementations/mtp/methods.lisp	Fri Jul 06 10:32:28 2007 +0100
+++ b/implementations/mtp/methods.lisp	Fri Jul 06 10:41:45 2007 +0100
@@ -133,12 +133,13 @@
 
 (defgeneric key-signature (event))
 (defmethod key-signature ((e mtp-event))
-  (let ((keysig (%mtp-keysig e))
-        (mode (%mtp-mode e))
-        (onset (timepoint e)))
-    (amuse:make-midi-key-signature keysig mode onset nil)))
+  (let* ((keysig (%mtp-keysig e))
+         (mode (%mtp-mode e))
+         (midi-mode (and mode (if (= mode 0) 0 1)))
+         (onset (timepoint e)))
+    (amuse:make-midi-key-signature keysig midi-mode onset nil)))
 
-(defmethod key-signatures ((c mtp-composition)) 
+(defmethod key-signatures ((c mtp-composition))
   (let ((results nil)
         (interval 0) 
         (current nil))