Mercurial > hg > amuse
changeset 278:8ec5cc5466fb
move copy-event generic into base
Ignore-this: d13c0b045f708efe242dd55e8ecdb4c4
darcs-hash:20090509113140-16a00-ad2445973b934beecc568ac9b975959aac94c549.gz
| author | j.forth <j.forth@gold.ac.uk> |
|---|---|
| date | Sat, 09 May 2009 12:31:40 +0100 |
| parents | e52b6eb30408 |
| children | c591a5034da6 |
| files | base/generics.lisp implementations/geerdes/constructors.lisp implementations/midi/methods.lisp |
| diffstat | 3 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/base/generics.lisp Sun Feb 01 21:01:15 2009 +0000 +++ b/base/generics.lisp Sat May 09 12:31:40 2009 +0100 @@ -461,3 +461,6 @@ (defgeneric move-to-first-bar (composition)) ;;this shouldn't be here +(defgeneric copy-event (event)) + +(defgeneric voice (event))
--- a/implementations/geerdes/constructors.lisp Sun Feb 01 21:01:15 2009 +0000 +++ b/implementations/geerdes/constructors.lisp Sat May 09 12:31:40 2009 +0100 @@ -132,7 +132,6 @@ :interval duration :id id)) -(defgeneric copy-event (event)) (defmethod copy-event ((event geerdes-pitched-event)) (with-slots ((channel amuse-midi::channel) (track amuse-midi::track)
--- a/implementations/midi/methods.lisp Sun Feb 01 21:01:15 2009 +0000 +++ b/implementations/midi/methods.lisp Sat May 09 12:31:40 2009 +0100 @@ -55,7 +55,6 @@ (defmethod (setf key-signatures) (sequence (composition midi-composition)) (setf (%midi-key-signatures composition) sequence)) -(defgeneric copy-event (event)) ;; FIXME: This ought to call-next-method and operate on the result, ;; rather than calling internals from the other package (defmethod copy-event ((event midi-pitched-event)) @@ -342,4 +341,4 @@ ((time>= period2 (cut-off period1)) (return-from %find-overlapping (reverse result-list))) ((time> (cut-off period2) period1) - (push period2 result-list)))))) \ No newline at end of file + (push period2 result-list))))))