# HG changeset patch # User Jeremy Gow # Date 1358766491 0 # Node ID 2fbff655ba477290cfe5fada9540f573a6443706 # Parent f54848e1f74cb3ae9692906a1731fc47cf22cf46 Removed cpitch-adj and cents SQL columns diff -r f54848e1f74c -r 2fbff655ba47 implementations/mtp/classes.lisp --- a/implementations/mtp/classes.lisp Mon Nov 19 15:11:49 2012 +0000 +++ b/implementations/mtp/classes.lisp Mon Jan 21 11:08:11 2013 +0000 @@ -50,8 +50,6 @@ (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 f54848e1f74c -r 2fbff655ba47 implementations/mtp/methods.lisp --- a/implementations/mtp/methods.lisp Mon Nov 19 15:11:49 2012 +0000 +++ b/implementations/mtp/methods.lisp Mon Jan 21 11:08:11 2013 +0000 @@ -10,7 +10,7 @@ (defvar *event-attributes* (list [dataset-id] [composition-id] [event-id] - [onset] [dur] [deltast] [cpitch] [cpitch-adj] [cents] + [onset] [dur] [deltast] [cpitch] [mpitch] [accidental] [keysig] [mode] [barlength] [pulses] [phrase] [tempo] [dyn] [voice] [bioi] [ornament] [comma] [articulation])) @@ -102,7 +102,7 @@ (defun db-event->mtp-event (db-event timebase) (let* ((slots ; the order must match *event-attributes* - '(amuse::time amuse::interval deltast cpitch cpitch-adj cents mpitch accidental + '(amuse::time amuse::interval deltast cpitch mpitch accidental keysig mode barlength pulses phrase tempo dyn voice bioi ornament comma articulation)) (time-slots '(amuse::time amuse::interval deltast barlength bioi))