Rename apply-at to apply-by and implement apply-at to apply the fn at the specified time, not before it.

Author: samaaron

src/overtone/examples/compositions/bells.clj

@@ -106,7 +106,7 @@
     (at (bell-metro beat)
         (dorun
          (map #(pretty-bell % :vol 0.5) notes-to-play)))
-    (apply-at (bell-metro next-beat) #'play-bells [next-beat (map rest notes)])))
+    (apply-by (bell-metro next-beat) #'play-bells [next-beat (map rest notes)])))
 
 ;; Start the bells ringing...
 (defn runner

src/overtone/examples/compositions/blues.clj

@@ -39,7 +39,7 @@
           (play-blues instr pitch))
       (at (+ time (* 0.5 dur))
           (closed-hat 0.1))
-      (apply-at n-time #'play-seq
+      (apply-by n-time #'play-seq
                 [(mod (inc count) 4) instr (next notes) (next durs) n-time odds]))))
 
 ; TODO: Strum the chord

src/overtone/examples/compositions/clapping_music.clj

@@ -32,7 +32,7 @@
 (defn player [beat]
   (when (= (mod beat 4) 0) (my-cycle))
   (play-beat beat)
-  (apply-at (m (inc beat)) #'player (inc beat) []))
+  (apply-by (m (inc beat)) #'player (inc beat) []))
 
 (player (m))
 ;;(stop)

src/overtone/examples/compositions/extemp_piano.clj

@@ -50,7 +50,7 @@
             (at (metro (+ beat offset)) (sampled-piano note 0.3)))
           notes-to-play
           beat-offsets))
-    (apply-at (metro (inc beat)) #'beat-loop [metro (inc beat) nxt-chord-idx])))
+    (apply-by (metro (inc beat)) #'beat-loop [metro (inc beat) nxt-chord-idx])))
 
 ;;start the music:
 (beat-loop metro (metro) 0)

src/overtone/examples/compositions/funk.clj

@@ -53,7 +53,7 @@
         (at (nome beat) (kick))
         (at (nome (+ 5 beat)) (kick))
         (at (nome (+ 7 beat)) (kick))
-        (apply-at (nome (+ 8 beat)) drums nome [])))
+        (apply-by (nome (+ 8 beat)) drums nome [])))
 
 (defn bass [nome]
     (let [beat (nome)]
@@ -71,7 +71,7 @@
     (at (nome (+ 8 beat)) (string 51))
     (at (nome (+ 12 beat)) (string 51))
     (at (subdivide (nome (+ 12 beat)) (nome (+ 14 beat)) 1) (string 51))
-    (apply-at (nome (+ 16 beat)) bass nome [])))
+    (apply-by (nome (+ 16 beat)) bass nome [])))
 
 (defn section [nome]
     (drums nome)

src/overtone/examples/compositions/jazz.clj

@@ -50,7 +50,7 @@
 (defn loop-play [bar len]
   (let [beat (metro)]
     (play-bar beat bar)
-    (apply-at (metro (+ len beat)) #'loop-play [bar len])))
+    (apply-by (metro (+ len beat)) #'loop-play [bar len])))
 
 (def length 4)
 
@@ -93,7 +93,7 @@
             next-even (if (zero? (mod beat 2))
                         beat
                         (inc beat))]
-        (apply-at (metro next-even) #'jazzbass [start-note])))
+        (apply-by (metro next-even) #'jazzbass [start-note])))
   ([n]
      (let [beat (metro)
            tick (metro beat)
@@ -111,7 +111,7 @@
          (at (metro (+ beat (swing 0.5)) )
            (beep note)
            (bass (midi->hz note))))
-       (apply-at (metro (+ beat 1)) #'jazzbass [note]))))
+       (apply-by (metro (+ beat 1)) #'jazzbass [note]))))
 
 
 ;; Set up rotater
@@ -134,7 +134,7 @@
    (do
      (at (metro start)
        (rotater-on note vel))
-     (apply-at
+     (apply-by
       (metro (+ len start))
       #'rotater-off [note]))))
 

src/overtone/examples/compositions/piano_phase.clj

@@ -14,7 +14,7 @@
     (when n
       (at t
         (sampled-piano (note n)))
-      (apply-at t-next #'player [t-next speed notes]))))
+      (apply-by t-next #'player [t-next speed notes]))))
 
 (def num-notes 1000)
 

src/overtone/examples/getting_started/basic.clj

@@ -74,7 +74,7 @@
         (if (zero? (mod beat 6))
           (overpad (+ 12 (choose notes)) 0.5 0.15 0.1)
           (overpad (choose notes) 0.5 0.15 0.1)))
-  (apply-at (metro (inc beat)) #'player (inc beat) (next notes) [])))
+  (apply-by (metro (inc beat)) #'player (inc beat) (next notes) [])))
 
 ;;(player (metro) [])
 ;;(stop)
@@ -87,7 +87,7 @@
           release   0.1
           next-beat (+ t beat-dur)]
       (at t (overpad note amp attack release))
-      (apply-at next-beat #'play-notes next-beat beat-dur (next notes) (next attacks) []))))
+      (apply-by next-beat #'play-notes next-beat beat-dur (next notes) (next attacks) []))))
 
 ;;(play-notes (now) 425 (cycle [40 42 44 45 47 49 51 52]) (repeat 0.4))
 ;;(play-notes (now) 300 (scale :c4 :major) (repeat 0.05))
@@ -109,7 +109,7 @@
     (at (metro b)
         (doseq [note (map #(- %  12) (chord-notes))]
             (overpad note 0.3 (/ tick 1020))))
-    (apply-at (metro next-beat) #'play-chords [next-beat])))
+    (apply-by (metro next-beat) #'play-chords [next-beat])))
 
 ;;(play-chords (metro))
 ;;(metro-bpm metro 70)
@@ -123,7 +123,7 @@
   (at t (kick-d))
   (at (+ t 350) (doseq [note (chord-notes)] (overpad (first notes) 0.3 0.1)))
   (at t (overpad (- (first notes) 36) 0.3 (/ dur 1000)))
-  (apply-at (+ t dur) #'looper (+ t dur) dur (next notes) []))
+  (apply-by (+ t dur) #'looper (+ t dur) dur (next notes) []))
 
 ;;(looper (now) 500 (cycle [60 67 65 72 75 70]))
 ;;(stop)

src/overtone/examples/getting_started/rhythm.clj

@@ -22,7 +22,7 @@
       (at (m (+ 1.25 beat))
           (soft-hat :decay 0.03)))
 
-    (apply-at (m next-beat) #'player [next-beat])))
+    (apply-by (m next-beat) #'player [next-beat])))
 
 ;;(player (m))
 ;;(stop)

src/overtone/examples/getting_started/video.clj

@@ -85,7 +85,7 @@
     (when note
       (at time (plucked-string note)))
     (let [next-time (+ time sep)]
-      (apply-at next-time play [next-time (rest notes) sep]))))
+      (apply-by next-time play [next-time (rest notes) sep]))))
 
 ;; play some pitches
 (play (now) pitches 200)

src/overtone/examples/gui/basic.clj

@@ -42,7 +42,7 @@
 
 (defn foo-player [b]
   (at (m b) (foo))
-  (apply-at (m (inc b)) #'foo-player [(inc b)]))
+  (apply-by (m (inc b)) #'foo-player [(inc b)]))
 
 ; Start the synth looping, and play with the GUI to hear it change live
 (foo-player (m))
@@ -59,7 +59,7 @@
 
 (defn bar-player [b]
   (at (m b) (bar))
-  (apply-at (m (inc b)) #'bar-player [(inc b)]))
+  (apply-by (m (inc b)) #'bar-player [(inc b)]))
 
 (bar-player (m))
 
@@ -133,7 +133,7 @@
 (defn step-player [b]
   (at (m b)
       (step-pad (+ 60 (nth (:steps @(:state pstep)) (mod b 16)))))
-  (apply-at (m (inc b)) #'step-player [(inc b)]))
+  (apply-by (m (inc b)) #'step-player [(inc b)]))
 
 (:steps @(:state pstep))
 

src/overtone/examples/notation/mad.clj

@@ -18,7 +18,7 @@
      (at t
          (synth pitch vol dur))
      (when elements
-       (apply-at next-t #'p elements [next-t])))))
+       (apply-by next-t #'p elements [next-t])))))
 
 (declare calc-duration)
 

src/overtone/examples/notation/mad2.clj

@@ -68,7 +68,7 @@
           beat (m)
           bar-start (m beat)]
       (play-over inst bar bar-start ms-per-bar)
-      (apply-at (m (+ beat beats-per-bar)) #'play [inst (next bars) m t-sig]))))
+      (apply-by (m (+ beat beats-per-bar)) #'play [inst (next bars) m t-sig]))))
 
 (def metro (metronome 120))
 

src/overtone/examples/timing/one_bar_sequencer.clj

@@ -38,7 +38,7 @@
   [m]
   (let [beat (m)]
     (player beat)
-    (apply-at (m (inc beat))  #'run-sequencer [m])))
+    (apply-by (m (inc beat))  #'run-sequencer [m])))
 
 ;; make beats! Edit bar whilst the beat is playing to make live changes.
 (run-sequencer metro)

src/overtone/gui/pianoroll.clj

@@ -147,7 +147,7 @@
           (when (= x index)
             (at (metro beat) (inst (+ offset y)))))
 
-        (apply-at (metro next-beat) #'piano-player
+        (apply-by (metro next-beat) #'piano-player
                   [state-atom next-beat])))))
 
 (defn piano-roll

src/overtone/gui/sequencer.clj

@@ -73,7 +73,7 @@
           (when (value index)
             (at (metro beat) (inst))))
 
-        (apply-at (metro next-beat) #'step-player
+        (apply-by (metro next-beat) #'step-player
                   [state-atom next-beat])))))
 
 (def ^{:private true} grid-line-style

src/overtone/music/time.clj

@@ -65,28 +65,43 @@
   [sched-fn] (at-at/kill sched-fn player-pool))
 
 (def ^{:dynamic true :private true} *apply-ahead*
-  "Amount of time apply-at is scheduled to execute *before* it was
+  "Amount of time apply-by is scheduled to execute *before* it was
   scheduled by the user. This is to give room for any computation/gc
   cycles and to allow the executing fn to schedule actions on scsynth
   ahead of time using the at macro."
   300)
 
-(defn apply-at
+(defn apply-by
   "Recursion in Time. Calls (apply f args argseq) *apply-ahead* ms
   before ms-time.
 
   By passing a function using #'foo syntax instead of just foo, when
   later called by the scheduler it will lookup based on the symbol
   rather than using the instance of the function defined earlier.
 
-  (apply-at (+ dur (now)) #'my-melody arg1 arg2 [])"
+  (apply-by (+ dur (now)) #'my-melody arg1 arg2 [])"
   {:arglists '([ms-time f args* argseq])}
   [#^clojure.lang.IFn ms-time f & args]
   (let [delay-time (- ms-time *apply-ahead* (now))]
     (if (<= delay-time 0)
       (after-delay 0 #(apply f (#'clojure.core/spread args)))
       (after-delay delay-time #(apply f (#'clojure.core/spread args))))))
 
+(defn apply-at
+  "Recursion in Time. Calls (apply f args argseq) exactly at time
+
+  By passing a function using #'foo syntax instead of just foo, when
+  later called by the scheduler it will lookup based on the symbol
+  rather than using the instance of the function defined earlier.
+
+  (apply-at (+ dur (now)) #'my-melody arg1 arg2 [])"
+  {:arglists '([ms-time f args* argseq])}
+  [#^clojure.lang.IFn ms-time f & args]
+  (let [delay-time (- ms-time (now))]
+    (if (<= delay-time 0)
+      (after-delay 0 #(apply f (#'clojure.core/spread args)))
+      (after-delay delay-time #(apply f (#'clojure.core/spread args))))))
+
 (defn show-schedule
   "Print the schedule of currently running audio players."
   []

src/overtone/studio/sequencer.clj

@@ -24,7 +24,7 @@
              (at (m (+ beat %1))
                (ins %2)))
           next-bar))
-      (apply-at next-tick hit-fn [m next-beat ins]))))
+      (apply-by next-tick hit-fn [m next-beat ins]))))
 
 (defn mono-play-fn
   ""
@@ -44,4 +44,4 @@
                  (at (m (inc b))
                      (ctl id :gate 0)))))
           next-bar))
-      (apply-at next-tick play-fn [m next-beat ins]))))
+      (apply-by next-tick play-fn [m next-beat ins]))))