# HG changeset patch # User Jeremy Gow # Date 1352366460 0 # Node ID 04940d80aaed0911e88811d6f0b7c19c8160be41 # Parent a47e1f34dae5e0920d4402d1f561ad3cbd14db03 Added cpitch-adj and cents as basic viewpoints diff -r a47e1f34dae5 -r 04940d80aaed implementations/mtp/classes.lisp --- a/implementations/mtp/classes.lisp Thu Nov 01 16:51:50 2012 +0000 +++ b/implementations/mtp/classes.lisp Thu Nov 08 09:21:00 2012 +0000 @@ -50,6 +50,8 @@ (bioi :initarg :bioi :accessor %mtp-bioi) (deltast :initarg :deltast :accessor %mtp-deltast) (cpitch :initarg :cpitch :accessor %mtp-cpitch) + (cpitch-adj :initarg :cpitch-adj :accessor %mtp-cpitch-adj) + (cents :initarg :cents :accessor %mtp-cents) (mpitch :initarg :mpitch :accessor %mtp-mpitch) (accidental :initarg :accidental :accessor %mtp-accidental) (keysig :initarg :keysig :accessor %mtp-keysig) diff -r a47e1f34dae5 -r 04940d80aaed implementations/mtp/methods.lisp --- a/implementations/mtp/methods.lisp Thu Nov 01 16:51:50 2012 +0000 +++ b/implementations/mtp/methods.lisp Thu Nov 08 09:21:00 2012 +0000 @@ -6,7 +6,8 @@ (defvar *event-attributes* (list [dataset-id] [composition-id] [event-id] - [onset] [dur] [deltast] [cpitch] [mpitch] [accidental] [keysig] [mode] + [onset] [dur] [deltast] [cpitch] [cpitch-adj] [cents] + [mpitch] [accidental] [keysig] [mode] [barlength] [pulses] [phrase] [tempo] [dyn] [voice] [bioi] [ornament] [comma] [articulation])) @@ -97,7 +98,7 @@ (defun db-event->mtp-event (db-event timebase) (let* ((slots ; the order must match *event-attributes* - '(amuse::time amuse::interval deltast cpitch mpitch accidental + '(amuse::time amuse::interval deltast cpitch cpitch-adj cents mpitch accidental keysig mode barlength pulses phrase tempo dyn voice bioi ornament comma articulation)) (time-slots '(amuse::time amuse::interval deltast barlength bioi))