comparison base/constructors.lisp @ 136:fd85f52d9f9d

Class revolution

* PITCH-DESIGNATOR -> PITCH (PITCH removed)
* MOMENT-DESIGNATOR -> MOMENT , MOMENT -> STANDARD-MOMENT
* PERIOD-DESIGNATOR -> PERIOD , PERIOD -> STANDARD-PERIOD
* ANCHORED-PERIOD-DESIGNATOR -> ANCHORED-PERIOD , ANCHORED-PERIOD -> STANDARD-ANCHORED-PERIOD
* FLOATING-PERIOD removed
* TIME-SIGNATURE-DESIGNATOR -> TIME-SIGNATURE & TIME-SIGNATURE-PERIOD
* TIME-SIGNATURE -> STANDARD-TIME-SIGNATURE & STANDARD-TIME-SIGNATURE-PERIOD
* KEY-SIGNATURE-DESIGNATOR -> KEY-SIGNATURE (& ...-PERIOD)
* KEY-SIGNATURE -> STANDARD-KEY-SIGNATURE (& ...-PERIOD)
* TEMPO now abstract (& TEMPO-PERIOD)
* STANDARD-TEMPO AND STANDARD-TEMPO-PERIOD
* COMPOSITION, CONSTITUENT & TIME-ORDERED-CONSTITUENT all have STANDARD- forms

make-x methods and specialisers changes appropriately

darcs-hash:20070831142943-f76cc-7be0d08963de06d87b36e4922076287d565c7ee2.gz

 (cl:in-package #:amuse)
 
 ;; Time classes
 
-(defun make-moment (time)
-  "Returns a new moment, taking a number as input for the time
-point."
+(defun make-standard-moment (time)
+  "Returns a new standard-moment, taking a number as input for
+the time point."
   (make-instance 'moment :time time))
 
 ;; N.B. period should never be constructed directly - it's either
 ;; floating or anchored or some other subclass.
 
-(defun make-floating-period (interval)
-  "Returns a new floating-period, taking a number for the
+(defun make-standard-period (interval)
+  "Returns a new (floating) period, taking a number for the
 duration."
-  (make-instance 'floating-period :interval interval))
+  (make-instance 'standard-period :interval interval))
 
 
 ;; Should this take a moment and/or a period too?
-(defun make-anchored-period (onset interval)
+(defun make-standard-anchored-period (onset interval)
   "Returns a new floating-period, taking numbers for onset and
 duration."
-  (make-instance 'anchored-period
+  (make-instance 'standard-anchored-period
 		 :time onset
 		 :interval interval))
 
 ;; Pitch classes (no, not that sort of pitch class)
 

   (make-instance 'chromatic-pitched-event
 		 :number pitch-number
 		 :time onset
 		 :interval duration))
 
-(defun make-basic-time-signature (numerator denominator onset duration)
-  (make-instance 'basic-time-signature
+(defun make-standard-time-signature (numerator denominator)
+  (make-instance 'standard-time-signature
+		 :numerator numerator
+		 :denominator denominator))
+
+(defun make-standard-time-signature-period (numerator denominator onset duration)
+  (make-instance 'standard-time-signature-period
 		 :numerator numerator
 		 :denominator denominator
 		 :time onset
 		 :interval duration))
 
-(defun make-basic-key-signature (sharp-count onset duration)
-  (make-instance 'basic-key-signature
+(defun make-standard-key-signature (sharp-count)
+  (make-instance 'standard-key-signature
+		 :sharp-count sharp-count))
+
+(defun make-standard-key-signature-period (sharp-count onset duration)
+  (make-instance 'standard-key-signature-period
 		 :sharp-count sharp-count
 		 :time onset
 		 :interval duration))
 
-(defun make-midi-key-signature (sharp-count mode onset duration)
+(defun make-midi-key-signature (sharp-count mode)
   (make-instance 'midi-key-signature
+		 :sharp-count sharp-count
+		 :mode mode))
+
+(defun make-midi-key-signature-period (sharp-count mode onset duration)
+  (make-instance 'midi-key-signature-period
 		 :sharp-count sharp-count
 		 :mode mode
 		 :time onset
 		 :interval duration))
 
-(defun make-tempo (bpm onset duration)
-  (make-instance 'tempo
+(defun make-standard-tempo (bpm)
+  (make-instance 'standard-tempo
 		 :bpm bpm
 		 :time onset
 		 :interval duration))
+
+(defun make-standard-tempo-period (bpm onset duration)
+  (make-instance 'standard-tempo-period
+		 :bpm bpm
+		 :time onset
+		 :interval duration))