Mercurial > hg > amuse
changeset 40:5bec705db9d6
Move midi-key-signature from implementations/midi to base/
darcs-hash:20070606134940-aa3d6-69b8a531ef8ae393234d065ff6105ed9ecd18434.gz
| author | m.pearce <m.pearce@gold.ac.uk> |
|---|---|
| date | Wed, 06 Jun 2007 14:49:40 +0100 |
| parents | 262aa7a3d500 |
| children | 90abdf9adb60 |
| files | base/classes.lisp base/constructors.lisp implementations/midi/classes.lisp implementations/midi/constructors.lisp |
| diffstat | 4 files changed, 14 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/base/classes.lisp Fri May 25 17:52:41 2007 +0100 +++ b/base/classes.lisp Wed Jun 06 14:49:40 2007 +0100 @@ -75,9 +75,15 @@ ((sharp-count :accessor %basic-key-signature-sharp-count :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 :accessor %midi-key-signature-mode + :initarg mode))) + (defclass tempo (anchored-period) ;; accel and rit in symbolic encoding will need other structures, as ;; will textual tempo markings. ((bpm :accessor %tempo-bpm :initarg :bpm))) - \ No newline at end of file +
--- a/base/constructors.lisp Fri May 25 17:52:41 2007 +0100 +++ b/base/constructors.lisp Wed Jun 06 14:49:40 2007 +0100 @@ -53,6 +53,13 @@ :time onset :interval duration)) +(defun make-midi-key-signature (sharp-count mode onset duration) + (make-instance 'midi-key-signature + :sharp-count sharp-count + :mode mode + :time onset + :interval duration)) + (defun make-tempo (bpm onset duration) (make-instance 'tempo :bpm bpm
--- a/implementations/midi/classes.lisp Fri May 25 17:52:41 2007 +0100 +++ b/implementations/midi/classes.lisp Wed Jun 06 14:49:40 2007 +0100 @@ -29,8 +29,3 @@ (sound :initarg :sound :accessor %midi-percussive-event-sound))) -(defclass midi-key-signature (basic-key-signature) - ;; Is mode ever used in real life? Is it ever accurately used in - ;; real life? - ((mode :accessor %midi-key-signature-mode - :initarg mode)))
--- a/implementations/midi/constructors.lisp Fri May 25 17:52:41 2007 +0100 +++ b/implementations/midi/constructors.lisp Wed Jun 06 14:49:40 2007 +0100 @@ -22,10 +22,4 @@ :time onset :interval duration)) -(defun make-midi-key-signature (sharp-count mode onset duration) - (make-instance 'midi-key-signature - :sharp-count sharp-count - :mode mode - :time onset - :interval duration))