Mercurial > hg > amuse

comparison implementations/mtp/methods.lisp @ 330:2fbff655ba47 tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed cpitch-adj and cents SQL columns
author Jeremy Gow <jeremy.gow@gmail.com>
date Mon, 21 Jan 2013 11:08:11 +0000
parents f54848e1f74c
children
comparison
equal deleted inserted replaced
329:f54848e1f74c 330:2fbff655ba47
8 8
9 #.(clsql:locally-enable-sql-reader-syntax) 9 #.(clsql:locally-enable-sql-reader-syntax)
10 10
11 (defvar *event-attributes* 11 (defvar *event-attributes*
12 (list [dataset-id] [composition-id] [event-id] 12 (list [dataset-id] [composition-id] [event-id]
13 [onset] [dur] [deltast] [cpitch] [cpitch-adj] [cents] 13 [onset] [dur] [deltast] [cpitch]
14 [mpitch] [accidental] [keysig] [mode] 14 [mpitch] [accidental] [keysig] [mode]
15 [barlength] [pulses] [phrase] [tempo] [dyn] [voice] [bioi] 15 [barlength] [pulses] [phrase] [tempo] [dyn] [voice] [bioi]
16 [ornament] [comma] [articulation])) 16 [ornament] [comma] [articulation]))
17 17
18 (defgeneric get-dataset (identifer)) 18 (defgeneric get-dataset (identifer))
100 100
101 #.(clsql:restore-sql-reader-syntax-state) 101 #.(clsql:restore-sql-reader-syntax-state)
102 102
103 (defun db-event->mtp-event (db-event timebase) 103 (defun db-event->mtp-event (db-event timebase)
104 (let* ((slots ; the order must match *event-attributes* 104 (let* ((slots ; the order must match *event-attributes*
105 '(amuse::time amuse::interval deltast cpitch cpitch-adj cents mpitch accidental 105 '(amuse::time amuse::interval deltast cpitch mpitch accidental
106 keysig mode barlength pulses phrase tempo dyn voice bioi 106 keysig mode barlength pulses phrase tempo dyn voice bioi
107 ornament comma articulation)) 107 ornament comma articulation))
108 (time-slots '(amuse::time amuse::interval deltast barlength bioi)) 108 (time-slots '(amuse::time amuse::interval deltast barlength bioi))
109 (mtp-event 109 (mtp-event
110 (make-mtp-event :dataset-id (first db-event) 110 (make-mtp-event :dataset-id (first db-event)