Mercurial > hg > amuse
changeset 272:d5ace22748df
Add basic viewpoints for commas and ornaments to the MTP backend.
| author | Marcus Pearce <m.pearce@gold.ac.uk> |
|---|---|
| date | Thu, 24 Mar 2011 15:54:27 +0000 |
| parents | 5d408226bf0b |
| children | df2505dc6d11 |
| files | implementations/mtp/classes.lisp implementations/mtp/methods.lisp |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/implementations/mtp/classes.lisp Fri Feb 11 16:56:01 2011 +0000 +++ b/implementations/mtp/classes.lisp Thu Mar 24 15:54:27 2011 +0000 @@ -59,5 +59,7 @@ (phrase :initarg :phrase :accessor %mtp-phrase) (tempo :initarg :tempo :accessor %mtp-tempo) (dyn :initarg :dyn :accessor %mtp-dyn) - (ornament :initarg :ornamental :accessor %mtp-ornament) + (ornament :initarg :ornament :accessor %mtp-ornament) + (comma :initarg :comma :accessor %mtp-comma) + (articulation :initarg :articulation :accessor %mtp-articulation) (voice :initarg :voice :accessor %mtp-voice)))
--- a/implementations/mtp/methods.lisp Fri Feb 11 16:56:01 2011 +0000 +++ b/implementations/mtp/methods.lisp Thu Mar 24 15:54:27 2011 +0000 @@ -7,7 +7,8 @@ (defvar *event-attributes* (list [dataset-id] [composition-id] [event-id] [onset] [dur] [deltast] [cpitch] [mpitch] [accidental] [keysig] [mode] - [barlength] [pulses] [phrase] [tempo] [dyn] [voice] [bioi] [ornament])) + [barlength] [pulses] [phrase] [tempo] [dyn] [voice] [bioi] + [ornament] [comma] [articulation])) (defgeneric get-dataset (identifer)) @@ -98,7 +99,7 @@ (let* ((slots ; the order must match *event-attributes* '(amuse::time amuse::interval deltast cpitch mpitch accidental keysig mode barlength pulses phrase tempo dyn voice bioi - ornament)) + ornament comma articulation)) (time-slots '(amuse::time amuse::interval deltast barlength bioi)) (mtp-event (make-mtp-event :dataset-id (first db-event)