Mercurial > hg > amuse
changeset 268:984e0b4dfaab
Add a new viewpoint for ornaments to mtp implementation.
| author | Marcus Pearce <marcusp@elgar.(none)> |
|---|---|
| date | Thu, 27 Jan 2011 12:13:39 +0000 |
| parents | 3b36cf79b525 |
| children | 12c0209cdcb8 |
| files | implementations/mtp/classes.lisp implementations/mtp/methods.lisp |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/implementations/mtp/classes.lisp Thu Jul 23 11:31:19 2009 +0100 +++ b/implementations/mtp/classes.lisp Thu Jan 27 12:13:39 2011 +0000 @@ -58,4 +58,5 @@ (phrase :initarg :phrase :accessor %mtp-phrase) (tempo :initarg :tempo :accessor %mtp-tempo) (dyn :initarg :dyn :accessor %mtp-dyn) + (ornamental :initarg :ornamental :accessor %mtp-ornamental) (voice :initarg :voice :accessor %mtp-voice)))
--- a/implementations/mtp/methods.lisp Thu Jul 23 11:31:19 2009 +0100 +++ b/implementations/mtp/methods.lisp Thu Jan 27 12:13:39 2011 +0000 @@ -7,7 +7,7 @@ (defvar *event-attributes* (list [dataset-id] [composition-id] [event-id] [onset] [dur] [deltast] [cpitch] [mpitch] [accidental] [keysig] [mode] - [barlength] [pulses] [phrase] [tempo] [dyn] [voice])) + [barlength] [pulses] [phrase] [tempo] [dyn] [voice] [bioi] [ornament])) (defgeneric get-dataset (identifer)) @@ -91,7 +91,8 @@ (defun db-event->mtp-event (db-event) (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)) + keysig mode barlength pulses phrase tempo dyn voice bioi + ornament)) (mtp-event (make-mtp-event :dataset-id (first db-event) :composition-id (second db-event)