Mercurial > hg > amuse
changeset 126:efaa02d21690
move amuse-midi out of amuse.asd to amuse-midi.asd
darcs-hash:20070730140900-c0ce4-9e8c4877f581746446186bf61de5501afcb11a32.gz
| author | Marcus Pearce <m.pearce@gold.ac.uk> |
|---|---|
| date | Mon, 30 Jul 2007 15:09:00 +0100 |
| parents | c179481a7bd0 |
| children | dc862a0c7b9c |
| files | amuse-midi.asd amuse.asd base/methods.lisp |
| diffstat | 3 files changed, 22 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/amuse-midi.asd Mon Jul 30 15:09:00 2007 +0100 @@ -0,0 +1,15 @@ +(asdf:defsystem amuse-midi + :name "amuse-mtp" + :description "" + :depends-on ("amuse" "midi") + :serial t + :components + ((:module implementations + :components + ((:module midi + :components + ((:file "package") + (:file "classes") + (:file "constructors") + (:file "midifile-import") + (:file "methods")))))))
--- a/amuse.asd Mon Jul 30 15:00:34 2007 +0100 +++ b/amuse.asd Mon Jul 30 15:09:00 2007 +0100 @@ -1,8 +1,8 @@ (asdf:defsystem amuse :name "amuse" :description "" + :depends-on ("midi" "mips") :serial t - :depends-on ("midi" "mips") :components ((:module base :components @@ -27,14 +27,6 @@ ((:file "package") (:file "classes" :depends-on ("package")) (:file "generics" :depends-on ("package")) - (:file "methods" :depends-on ("package" "classes" "generics")))))) - (:module implementations - :components - ((:module midi - :components - ((:file "package") - (:file "classes" :depends-on ("package")) - (:file "constructors" :depends-on ("package" "classes")) - (:file "midifile-import" :depends-on ("package" "classes" "constructors")) - (:file "methods" :depends-on ("package" "midifile-import" "classes")))))))) + (:file "methods" :depends-on ("package" "classes" "generics")))))))) +
--- a/base/methods.lisp Mon Jul 30 15:00:34 2007 +0100 +++ b/base/methods.lisp Mon Jul 30 15:09:00 2007 +0100 @@ -108,11 +108,13 @@ (print-unreadable-object (o stream :type t) (write (timepoint o) :stream stream))) -(defmethod print-object ((o period ) stream) +(defmethod print-object ((o period) stream) (print-unreadable-object (o stream :type t) (write (duration o) :stream stream))) - +(defmethod print-object ((o anchored-period) stream) + (print-unreadable-object (o stream :type t) + (format stream "~A ~A" (timepoint o) (duration o)))) (defmethod beat-units-per-bar ((time-signature basic-time-signature)) (%basic-time-signature-numerator time-signature))