comparison methods.lisp @ 22:99ccd775245a

Moved midi out of main files

darcs-hash:20061214125711-f76cc-c9e7f9af1054c67473ff6d8a8e3b84e45fe43f35.gz

 (cl:in-package #:amuse) 
 
 (defmethod chromatic-pitch ((pitch-designator chromatic-pitch))
   pitch-designator)
 
-(defmethod chromatic-pitch-number ((pitch-designator chromatic-pitch))
+(defmethod midi-pitch-number ((pitch-designator chromatic-pitch))
   (%chromatic-pitch-number pitch-designator))
 
-(defmethod chromatic-pitch-number ((pitch-designator pitch))
+(defmethod midi-pitch-number ((pitch-designator pitch))
   (%chromatic-pitch-number (chromatic-pitch pitch-designator)))
 
 (defmethod span ((pitch-interval-designator pitch-interval))
   (%pitch-interval-span pitch-interval-designator))
 

   (cond
     ((disjoint object1 object2)
      ;; if they don't overlap, return nil, not a negative-valued
      ;; period
      nil)
-    (t
-     (let ((new-onset (max (timepoint object1)
-			   (timepoint object2))))
-       (make-anchored-period new-onset
-			     (time- (min (cut-off object1)
-					 (cut-off object2))
-				    new-onset))))))
+    ((let* ((start (if (time> (onset object2) (onset object1))
+		       (onset object2)
+		       (onset object1)))
+	    (duration (duration (time- (if (time> (cut-off object2) (cut-off object1))
+					   (cut-off object1)
+					   (cut-off object2))
+				       start))))
+       (make-anchored-period (timepoint start) duration)))))
+