Overview
| Comment: | add some instruments, fix some bugs (piano is not real yet) |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
5422ffcfca2085c3b54be1d35c75c7ab |
| User & Date: | lexi on 2025-03-14 17:35:14 |
| Other Links: | manifest | tags |
Context
|
2025-03-14
| ||
| 19:27 | add docs Leaf check-in: a597ad7ee7 user: lexi tags: trunk | |
| 17:35 | add some instruments, fix some bugs (piano is not real yet) check-in: 5422ffcfca user: lexi tags: trunk | |
|
2025-03-12
| ||
| 06:46 | initial ostinata commit check-in: 908662f1b1 user: lexi tags: trunk | |
Changes
Modified ostinata/ostinata.janet from [ec4176d797] to [567adb1f1f].
143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 ... 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 ... 282 283 284 285 286 287 288 289 290 291 292 293 294 295 ... 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 ... 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 ... 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 |
:cfg {:base 800 :span 600 :chime 1}
:setup freq-spread-notes
:note (fn sine:note [me env n]
(def freq (get-in me [:notes (n :index)]))
[(* (me :ampl) (n :vel)) freq (get-in me [:cfg :chime])]))
:string (struct/with-proto <instr>
:name "string"
:cfg {:base 500 # shortest frequency
:span 300 # range of frequencies
:decay 0}
:setup freq-spread-notes
:note (fn drum:note [me env n]
(def freq (get-in me [:notes (n :index)]))
(def c (me :cfg))
[(* (me :ampl) (n :vel)) freq (- 1 (* .1 (c :decay)))]))
})
(defn timecode→string [t]
(def μs (% t 1))
(def s (math/floor (% t 60)))
(def m (math/floor (% (/ t 60) 60)))
................................................................................
(def ins (:instr-for-chan env chan))
(defn note-key? [k]
(not (nil? (get-in ins [:note-map :key->index k]))))
(defn draw-stat-line [timecode]
(def sustain @[])
(defn clr [& r] (:color (env :tty) ;r))
# (defn vbar [& r] (:vbar (env :tty) ;r))
(each n (get-in ins [:note-map :keys])
(when-let [k (get held n nil)]
(def k (string/format "%c" n))
(array/push sustain k)))
(:msg env "\r\e[2K%s\r"
(string
(if rec "\e[91m⏺"
"\e[94m⏹") "\e[m"
(clr [.9 .95 1] [0.1 0.2 0.4]
(string " " (timecode→string timecode) " "))
(:vol-bar env (/ loud 11))
# (vbar (/ loud 11)
# [.5 1 .25]
# [1.0 1.0 0.25]
# [.8 0 0])
" " (chan :instr) "\e[96m@" (env :chan) "\e[m"
" \e[1m" (if rec "record" "play") "\e[m"
(string/join sustain))))
(def timewarp (get-in chan [:cfg :timewarp] 1.0))
(defn advance-clock [res]
(protect (forever
(def cur-time (ticks))
................................................................................
(defn stop-clock []
(when clock-fiber
(ev/cancel clock-fiber nil)
(set clock-fiber nil))
(when player-fiber
(ev/cancel player-fiber nil)
(set player-fiber nil)))
(defn ins-cmd [method & args]
((ins method) ins env ;args))
(defn stop-all-notes []
(eachp [k v] held
(:send env ;(ins-cmd :stop v 0))))
(defn cleanup []
................................................................................
(commit-unless-shift))
{:how :press :key :shift-l} (+= loud 1)
{:how :release :key :shift-l} (-= loud 1)
{:how :press :key :shift-r} (-= loud .5)
{:how :release :key :shift-r} (+= loud .5)
{:how :press :key :tab}
(do (put env :time start-time)
(stop-clock) (start-clock))
({:how :press :key n}
(<= 0x31 n 0x39))
(set loud (- n 0x30))
({:how :press :key k}
(note-key? k)
(nil? (held k)))
(do (def note {:id cur-id :vel loud
................................................................................
(:set-mode env :cmd)
_ (:msg env "event packet: %P\r\n"
(struct/proto-flatten event))
))))
(defn mk-channel []
@{:instr :sine
:ampl 1
:cfg @{}
:mute false})
(defn present-file [env text]
(def lines (string/split "\n" text))
(defn c [& r] (:color (env :tty) ;r))
................................................................................
(return give-up))
(<= (+ n histidx) lastidx)
(set histidx (max 0 (+ n histidx)))
:else (return give-up))
(set cmd-line (buffer (history histidx)))))
(when (or (= (event :how) :press)
(= (event :how) :repeat))
(match event
{:key :bksp} (buffer/popn cmd-line 1)
{:key :tab} (do)
{:key :up} (go-history -1)
{:key :dn} (go-history 1)
{:key :enter} (do
(:msg env "\r\n")
(set histidx nil)
(do-cmd cmd-line env)
(array/push history (string cmd-line))
(buffer/clear cmd-line))
{:text t} (buffer/push cmd-line t)
)))))
(defn task-cmd [env]
"command input handling"
(def {:tty tty} env)
(var mode nil)
|
| | | > > > > > > > > > > > > > > > > > > | > > > > > > > > > | < | > | > > > > | | | < < < < < | | | | | > > > > > > > > |
143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 ... 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 ... 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 ... 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 ... 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 ... 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 |
:cfg {:base 800 :span 600 :chime 1}
:setup freq-spread-notes
:note (fn sine:note [me env n]
(def freq (get-in me [:notes (n :index)]))
[(* (me :ampl) (n :vel)) freq (get-in me [:cfg :chime])]))
:string (struct/with-proto <instr>
:name "string"
:cfg {:base 200 # shortest frequency
:span 600 # range of frequencies
:decay 0}
:setup freq-spread-notes
:note (fn string:note [me env n]
(def freq (get-in me [:notes (n :index)]))
(def c (me :cfg))
[(* (me :ampl) (n :vel)) freq (- 1 (* .1 (c :decay)))]))
:piano (struct/with-proto <instr>
:name "piano"
:cfg {:base 400 # shortest frequency
:span 600} # range of frequencies
:setup freq-spread-notes
:note (fn piano:note [me env n]
(def freq (get-in me [:notes (n :index)]))
[(* (me :ampl) (n :vel)) freq]))
:warbulator (struct/with-proto <instr>
:name "warbulator"
:cfg {:base 400 # shortest frequency
:span 600 # range of frequencies
:range 3}
:setup freq-spread-notes
:note (fn warbulator:note [me env n]
(def freq (get-in me [:notes (n :index)]))
(def c (me :cfg))
[(* (me :ampl) (n :vel)) freq (c :range) (c :range)]))
})
(defn timecode→string [t]
(def μs (% t 1))
(def s (math/floor (% t 60)))
(def m (math/floor (% (/ t 60) 60)))
................................................................................
(def ins (:instr-for-chan env chan))
(defn note-key? [k]
(not (nil? (get-in ins [:note-map :key->index k]))))
(defn draw-stat-line [timecode]
(def sustain @[])
(defn clr [& r] (:color (env :tty) ;r))
# (defn vbar [& r] (:vbar (env :tty) ;r))
(def key-color-lut
[[0.8 0.0 0.2]
[0.2 0.5 1.0]
[0.3 1.0 0.2]
])
(let [nm (ins :note-map)]
(defn key->fac [k]
(def ki (get-in nm [:key->index (k 0)]))
(/ ki (nm :n)))
(each n (nm :keys)
(when-let [k (held (n 0))]
(array/push sustain
(clr (alg/vlut (key->fac n) key-color-lut) [0 0 0] n)))))
(:msg env "\r\e[2K%s\r"
(string
(if rec "\e[91m⏺"
"\e[94m⏹") "\e[m"
(clr [.9 .95 1] [0.1 0.2 0.4]
(string " " (timecode→string timecode) " "))
(:vol-bar env (/ loud 11))
# (vbar (/ loud 11)
# [.5 1 .25]
# [1.0 1.0 0.25]
# [.8 0 0])
" " (chan :instr) "\e[96m@" (env :chan) "\e[m"
" \e[1m" (if rec "record" "play") "\e[m "
(string/join sustain))))
(def timewarp (get-in chan [:cfg :timewarp] 1.0))
(defn advance-clock [res]
(protect (forever
(def cur-time (ticks))
................................................................................
(defn stop-clock []
(when clock-fiber
(ev/cancel clock-fiber nil)
(set clock-fiber nil))
(when player-fiber
(ev/cancel player-fiber nil)
(set player-fiber nil)))
(defn maybe-restart-clock []
(def restart? (not= nil clock-fiber))
(stop-clock)
(when restart? (start-clock)))
(defn ins-cmd [method & args]
((ins method) ins env ;args))
(defn stop-all-notes []
(eachp [k v] held
(:send env ;(ins-cmd :stop v 0))))
(defn cleanup []
................................................................................
(commit-unless-shift))
{:how :press :key :shift-l} (+= loud 1)
{:how :release :key :shift-l} (-= loud 1)
{:how :press :key :shift-r} (-= loud .5)
{:how :release :key :shift-r} (+= loud .5)
{:how :press :key :tab}
(do (put env :time start-time)
(maybe-restart-clock))
({:how :press :key n}
(<= 0x31 n 0x39))
(set loud (- n 0x30))
({:how :press :key k}
(note-key? k)
(nil? (held k)))
(do (def note {:id cur-id :vel loud
................................................................................
(:set-mode env :cmd)
_ (:msg env "event packet: %P\r\n"
(struct/proto-flatten event))
))))
(defn mk-channel []
@{:instr :string
:ampl 1
:cfg @{}
:mute false})
(defn present-file [env text]
(def lines (string/split "\n" text))
(defn c [& r] (:color (env :tty) ;r))
................................................................................
(return give-up))
(<= (+ n histidx) lastidx)
(set histidx (max 0 (+ n histidx)))
:else (return give-up))
(set cmd-line (buffer (history histidx)))))
(when (or (= (event :how) :press)
(= (event :how) :repeat))
(defn execute []
(:msg env "\r\n")
(set histidx nil)
(do-cmd cmd-line env)
(array/push history (string cmd-line))
(buffer/clear cmd-line))
(defn complete [])
(match event
{:key :bksp} (buffer/popn cmd-line 1)
{:key :tab} (complete)
{:key :up} (go-history -1)
{:key :dn} (go-history 1)
{:key :enter} (execute)
{:key :kp-enter} (execute)
{:text t} (buffer/push cmd-line t)
)))))
(defn task-cmd [env]
"command input handling"
(def {:tty tty} env)
(var mode nil)
|
Modified ostinata/ostinata.orc from [fcb089814a] to [1a1b5670ed].
8
9
10
11
12
13
14
15
16
17
18
19
20
21
..
50
51
52
53
54
55
56
|
; p5 freq
givol ftgen 1, 0, 10000, 25, \
500, 60, \
1000, 20, \
7000, 3, \
10000, 5
instr sine
tigoto skipinit
kt init 0
al init 1.0
ifreq = p5
ichime = p6
................................................................................
if p3 >= 0 then
aw = aw * at
endif
out aw
endin
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
..
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
; p5 freq givol ftgen 1, 0, 10000, 25, \ 500, 60, \ 1000, 20, \ 7000, 3, \ 10000, 5 gipian ftgen 2, 0, 10000, 10, \ 1, 0.5, 0.3, 0.25, 0.2, 0.167, 0.14, 0.125, .111 instr sine tigoto skipinit kt init 0 al init 1.0 ifreq = p5 ichime = p6 ................................................................................ if p3 >= 0 then aw = aw * at endif out aw endin instr warbulator tigoto skipinit irange = p6 ifreq = p5 ivol = p4 * 40 * table(ifreq, givol) ata poscil 1.0, 100 atf poscil 1.0, bpf(ata, 0,1, 1,100) atq poscil 1.0, bpf(atf, 0,ifreq, 1,ifreq*irange) skipinit: aw = atq if p3 >= 0 then at linseg 1, p3, 0 aw = aw * at endif out ivol * aw endin instr bell tigoto skipinit ifreq = p5 ivol = p4 * 40 * table(ifreq, givol) at poscil 1.0, ifreq*2 af poscil 1.0, bpfcos(at, 0,ifreq, 1,ifreq*2.5) skipinit: aw = af if p3 >= 0 then at linseg 1, p3, 0 aw = aw * at endif out ivol * aw endin |