Dariaceli's Git
Browse code

Ported audio examples to 4 channels

neauoire authored on 27/04/2021 03:55:51
Showing 4 changed files
projects/demos/piano.usm
History View file @ 67dfbc1
... ... 
@@ -6,14 +6,18 @@
6 6 
 %2/ { #0002 DIV2 }
7 7 
 %++ { #0001 ADD2 }
8 8 
 %TOS { #00 SWP }
9 
+%MOD { DUP2 DIV MUL SUB }
9 10
10 11 
 ( devices )
11 12
12 13 
 |00 @System     [ &vector $2 &pad      $6 &r      $2 &g     $2 &b      $2 ]
13 14 
 |10 @Console    [ &pad    $8 &char     $1 &byte   $1 &short $2 &string $2 ]
14 15 
 |20 @Screen     [ &vector $2 &width    $2 &height $2 &pad   $2 &x      $2 &y     $2 &addr $2 &color $1 ]
15 
-|30 @Audio      [ &vector $2 &output   $1 &pad    $5 &adsr     $2 &length $2 &addr  $2 &volume $1 &pitch $1 ]
16 
-|70 @Midi       [ &vector $2 &message  $2 ]
16 
+|30 @Audio0     [ &vector $2 &output   $1 &pad    $5 &adsr  $2 &length $2 &addr  $2 &volume $1 &pitch $1 ]
17 
+|40 @Audio1     [ &vector $2 &output   $1 &pad    $5 &adsr  $2 &length $2 &addr  $2 &volume $1 &pitch $1 ]
18 
+|50 @Audio2     [ &vector $2 &output   $1 &pad    $5 &adsr  $2 &length $2 &addr  $2 &volume $1 &pitch $1 ]
19 
+|60 @Audio3     [ &vector $2 &output   $1 &pad    $5 &adsr  $2 &length $2 &addr  $2 &volume $1 &pitch $1 ]
20 
+|70 @Midi       [ &vector $2 &channel  $1 &note   $1 &velocity $1 ]
17 21 
 |80 @Controller [ &vector $2 &button   $1 &key    $1 ]
18 22 
 |90 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &chord  $1 ]
19 23
... ... 
@@ -71,10 +75,10 @@
71 75
72 76 
 	( default settings )
73 77 
 	#ff .last POK
74 
-	#048c .Audio/adsr DEO2
75 
-	#88 .Audio/volume DEO
76 
-	;sine-wave .Audio/addr DEO2
77 
-	;sine-wave/end ;sine-wave SUB2 #0001 SFT2 .Audio/length DEO2
78 
+	#048c .Audio0/adsr DEO2
79 
+	#88 .Audio0/volume DEO
80 
+	;sine-wave .Audio0/addr DEO2
81 
+	;sine-wave/end ;sine-wave SUB2 #0001 SFT2 .Audio0/length DEO2
78 82
79 83 
 	( inital drawing )
80 84 
 	;draw-octave JSR2
... ... 
@@ -87,15 +91,15 @@ BRK
87 91
88 92 
 	.wave-view/x1 PEK2 #0028 ADD2 .Screen/x DEO2
89 93 
 	.wave-view/y1 PEK2 #0010 SUB2 .Screen/y DEO2
90 
-	.Audio/output DEI #04 SFT TOS #0008 MUL2 ;meter ADD2 .Screen/addr DEO2
94 
+	.Audio0/output DEI #04 SFT TOS #0008 MUL2 ;meter ADD2 .Screen/addr DEO2
91 95 
 	#21 .Screen/color DEO
92 96
93 
-
94 97 
 BRK
95 98
96 99 
 @on-midi ( -> )
97 100
98 
-	.Midi/message DEI .Audio/pitch DEO
101 
+	.Midi/note DEI #00 NEQ ,&note-on JNZ BRK &note-on
102 
+	.Midi/note DEI .Audio0/pitch .Midi/channel DEI #04 MOD #10 MUL ADD DEO
99 103
100 104 
 BRK
101 105
... ... 
@@ -120,7 +124,7 @@ BRK
120 124
121 125 
 @on-touch-wave-view ( -> )
122 126
123 
-	.Mouse/x DEI2 .wave-view/x1 PEK2 SUB2 .Audio/length DEO2
127 
+	.Mouse/x DEI2 .wave-view/x1 PEK2 SUB2 .Audio0/length DEO2
124 128 
 	;draw-wave JSR2
125 129 
 	;draw-cursor JSR2
126 130
... ... 
@@ -151,21 +155,21 @@ BRK
151 155
152 156 
 	.Mouse/x DEI2 .adsr-view/x1 PEK2 SUB2 8/ SWP POP #03 DIV
153 157 
 	DUP #00 NEQ ,&no-a JNZ
154 
-		.Audio/adsr DEI
158 
+		.Audio0/adsr DEI
155 159 
 		#10 .Mouse/state DEI #10 EQU #e0 MUL ADD ADD
156 
-		.Audio/adsr DEO &no-a
160 
+		.Audio0/adsr DEO &no-a
157 161 
 	DUP #01 NEQ ,&no-d JNZ
158 
-		.Audio/adsr DEI
162 
+		.Audio0/adsr DEI
159 163 
 		DUP #f0 AND STH #01 .Mouse/state DEI #10 EQU #0e MUL ADD ADD #0f AND STHr ADD
160 
-		.Audio/adsr DEO &no-d
164 
+		.Audio0/adsr DEO &no-d
161 165 
 	DUP #02 NEQ ,&no-s JNZ
162 
-		.Audio/adsr #01 ADD DEI
166 
+		.Audio0/adsr #01 ADD DEI
163 167 
 		#10 .Mouse/state DEI #10 EQU #e0 MUL ADD ADD
164 
-		.Audio/adsr #01 ADD DEO &no-s
168 
+		.Audio0/adsr #01 ADD DEO &no-s
165 169 
 	DUP #03 NEQ ,&no-r JNZ
166 
-		.Audio/adsr #01 ADD DEI
170 
+		.Audio0/adsr #01 ADD DEI
167 171 
 		DUP #f0 AND STH #01 .Mouse/state DEI #10 EQU #0e MUL ADD ADD #0f AND STHr ADD
168 
-		.Audio/adsr #01 ADD DEO &no-r
172 
+		.Audio0/adsr #01 ADD DEO &no-r
169 173 
 	POP
170 174
171 175 
 	( release ) #00 .Mouse/state DEO
... ... 
@@ -203,13 +207,13 @@ BRK
203 207
204 208 
 	.Controller/button DEI #f0 AND
205 209 
 	DUP #04 SFT #01 AND #01 NEQ ,&no-up JNZ
206 
-		( move ) .Audio/addr DEI2 #0001 SUB2 .Audio/addr DEO2 &no-up
210 
+		( move ) .Audio0/addr DEI2 #0001 SUB2 .Audio0/addr DEO2 &no-up
207 211 
 	DUP #05 SFT #01 AND #01 NEQ ,&no-down JNZ
208 
-		( move ) .Audio/addr DEI2 #0001 ADD2 .Audio/addr DEO2 &no-down
212 
+		( move ) .Audio0/addr DEI2 #0001 ADD2 .Audio0/addr DEO2 &no-down
209 213 
 	DUP #06 SFT #01 AND #01 NEQ ,&no-left JNZ
210 
-		( move ) .Audio/addr DEI2 #0010 SUB2 .Audio/addr DEO2 &no-left
214 
+		( move ) .Audio0/addr DEI2 #0010 SUB2 .Audio0/addr DEO2 &no-left
211 215 
 	DUP #07 SFT #01 AND #01 NEQ ,&no-right JNZ
212 
-		( move ) .Audio/addr DEI2 #0010 ADD2 .Audio/addr DEO2 &no-right
216 
+		( move ) .Audio0/addr DEI2 #0010 ADD2 .Audio0/addr DEO2 &no-right
213 217 
 	POP
214 218
215 219 
 	;draw-octave JSR2
... ... 
@@ -219,7 +223,7 @@ BRK
219 223
220 224 
 @play ( pitch -- )
221 225
222 
-	.octave PEK #0c MUL ADD .Audio/pitch DEO
226 
+	.octave PEK #0c MUL ADD .Audio0/pitch DEO
223 227
224 228 
 RTN
225 229
... ... 
@@ -290,16 +294,16 @@ RTN
290 294 
 @draw-adsr ( -- )
291 295
292 296 
 	.adsr-view/x1 PEK2 .adsr-view/y1 PEK2
293 
-		.Audio/adsr DEI #04 SFT
297 
+		.Audio0/adsr DEI #04 SFT
294 298 
 		;draw-knob JSR2
295 299 
 	.adsr-view/x1 PEK2 #0018 ADD2 .adsr-view/y1 PEK2
296 
-		.Audio/adsr DEI #0f AND
300 
+		.Audio0/adsr DEI #0f AND
297 301 
 		;draw-knob JSR2
298 302 
 	.adsr-view/x1 PEK2 #0030 ADD2 .adsr-view/y1 PEK2
299 
-		.Audio/adsr #01 ADD DEI #04 SFT
303 
+		.Audio0/adsr #01 ADD DEI #04 SFT
300 304 
 		;draw-knob JSR2
301 305 
 	.adsr-view/x1 PEK2 #0048 ADD2 .adsr-view/y1 PEK2
302 
-		.Audio/adsr #01 ADD DEI #0f AND
306 
+		.Audio0/adsr #01 ADD DEI #0f AND
303 307 
 		;draw-knob JSR2
304 308
305 309 
 RTN
... ... 
@@ -324,11 +328,11 @@ RTN
324 328 
 			.wave-view/y1 PEK2 #0010 ADD2 .Screen/y DEO2
325 329 
 			#03 .Screen/color DEO
326 330 
 		&no-dot
327 
-		OVR TOS .Audio/addr DEI2 ADD2 GET
331 
+		OVR TOS .Audio0/addr DEI2 ADD2 GET
328 332 
 		#02 DIV #40 ADD DUP #07 SFT #80 MUL SUB
329 333 
 		TOS #0004 DIV2 .wave-view/y1 PEK2 ADD2 .Screen/y DEO2
330 334 
 		.Screen/x DEI2 ++ .Screen/x DEO2
331 
-		( draw ) OVR .Audio/length DEI2 SWP POP GTH #02 MUL #01 ADD .Screen/color DEO
335 
+		( draw ) OVR .Audio0/length DEI2 SWP POP GTH #02 MUL #01 ADD .Screen/color DEO
332 336 
 		( incr ) SWP #01 ADD SWP
333 337 
 		DUP2 LTH ,&loop JNZ
334 338 
 	POP2
... ... 
@@ -336,16 +340,16 @@ RTN
336 340 
 	( range )
337 341 
 	.wave-view/x1 PEK2 .Screen/x DEO2
338 342 
 	.wave-view/y1 PEK2 #0010 SUB2 .Screen/y DEO2
339 
-	.Audio/addr DEI2 ;draw-short JSR2
343 
+	.Audio0/addr DEI2 ;draw-short JSR2
340 344 
 	.wave-view/x2 PEK2 #0020 SUB2 .Screen/x DEO2
341 
-	.Audio/length DEI2 ;draw-short JSR2
345 
+	.Audio0/length DEI2 ;draw-short JSR2
342 346
343 347 
 RTN
344 348
345 349 
 @draw-wave-length ( color -- )
346 350
347 351 
 	STH
348 
-	.wave-view/x1 PEK2 .Audio/length DEI2 ADD2 .Screen/x DEO2
352 
+	.wave-view/x1 PEK2 .Audio0/length DEI2 ADD2 .Screen/x DEO2
349 353 
 	.wave-view/y1 PEK2 DUP2 #0020 ADD2
350 354 
 	&loop
351 355 
 		OVR2 .Screen/y DEO2
projects/examples/blank.usm
History View file @ 67dfbc1
... ... 
@@ -4,8 +4,12 @@
4 4
5 5 
 |00 @System     [ &vector $2 &pad      $6 &r      $2 &g     $2 &b      $2 ]
6 6 
 |10 @Console    [ &pad    $8 &char     $1 &byte   $1 &short $2 &string $2 ]
7 
-|20 @Screen     [ &vector $2 &width    $2 &height $2 &pad   $2 &x      $2 &y     $2 &addr $2 &color $1 ]
8 
-|30 @Audio      [ &wave   $2 &envelope $2 &pad    $4 &volume $1 &pitch $1 &play $1 &value $2 &delay $2 &finish $1 ]
7 
+|20 @Screen     [ &vector $2 &width    $2 &height $2 &pad   $2 &x      $2 &y     $2 &addr   $2 &color $1 ]
8 
+|30 @Audio0     [ &vector $2 &output   $1 &pad    $5 &adsr  $2 &length $2 &addr  $2 &volume $1 &pitch $1 ]
9 
+|40 @Audio1     [ &vector $2 &output   $1 &pad    $5 &adsr  $2 &length $2 &addr  $2 &volume $1 &pitch $1 ]
10 
+|50 @Audio2     [ &vector $2 &output   $1 &pad    $5 &adsr  $2 &length $2 &addr  $2 &volume $1 &pitch $1 ]
11 
+|60 @Audio3     [ &vector $2 &output   $1 &pad    $5 &adsr  $2 &length $2 &addr  $2 &volume $1 &pitch $1 ]
12 
+|70 @Midi       [ &vector $2 &channel  $1 &note   $1 &velocity $1 ]
9 13 
 |80 @Controller [ &vector $2 &button   $1 &key    $1 ]
10 14 
 |90 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &chord $1 ]
11 15 
 |a0 @File       [ &vector $2 &success  $2 &offset $2 &pad   $2 &name  $2 &length $2 &load $2 &save $2 ]
projects/software/enfer.usm
History View file @ 67dfbc1
12 16 
new file mode 100644
... ... 
@@ -0,0 +1,453 @@
1 
+( enfer )
2 
+
3 
+%RTN { JMP2r }
4 
+%8+ { #0008 ADD2 }
5 
+%8/ { #0008 DIV2 }
6 
+%2/ { #0002 DIV2 }
7 
+%2* { #0002 MUL2 }
8 
+%++ { #0001 ADD2 }
9 
+%TOS { #00 SWP }
10 
+%MOD { DUP2 DIV MUL SUB }
11 
+
12 
+%VIEW-WIDTH { #0110 }
13 
+%VIEW-HEIGHT { #0038 }
14 
+%PRINT-BYTE { .Console/byte DEO #0d .Console/char DEO }
15 
+%PRINT-SHORT { .Console/short DEO2 #0d .Console/char DEO }
16 
+
17 
+( devices )
18 
+
19 
+|00 @System     [ &vector $2 &pad      $6 &r      $2 &g     $2 &b      $2 ]
20 
+|10 @Console    [ &pad    $8 &char     $1 &byte   $1 &short $2 &string $2 ]
21 
+|20 @Screen     [ &vector $2 &width    $2 &height $2 &pad   $2 &x      $2 &y     $2 &addr   $2 &color $1 ]
22 
+|30 @Audio0     [ &vector $2 &output   $1 &pad    $5 &adsr  $2 &length $2 &addr  $2 &volume $1 &pitch $1 ]
23 
+|40 @Audio1     [ &vector $2 &output   $1 &pad    $5 &adsr  $2 &length $2 &addr  $2 &volume $1 &pitch $1 ]
24 
+|50 @Audio2     [ &vector $2 &output   $1 &pad    $5 &adsr  $2 &length $2 &addr  $2 &volume $1 &pitch $1 ]
25 
+|60 @Audio3     [ &vector $2 &output   $1 &pad    $5 &adsr  $2 &length $2 &addr  $2 &volume $1 &pitch $1 ]
26 
+|70 @Midi       [ &vector $2 &channel  $1 &note   $1 &velocity $1 ]
27 
+|80 @Controller [ &vector $2 &button   $1 &key    $1 ]
28 
+|90 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &chord $1 ]
29 
+|a0 @File       [ &vector $2 &success  $2 &offset $2 &pad   $2 &name  $2 &length $2 &load $2 &save $2 ]
30 
+|b0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
31 
+
32 
+( variables )
33 
+
34 
+|0000
35 
+
36 
+@addr $2
37 
+@color $1
38 
+@center      [ &x $2 &y $2 ]
39 
+@pointer     [ &x $2 &y $2 ]
40 
+@rect        [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ]
41 
+@knob        [ &x $2 &y $2 &value $1 ]
42 
+
43 
+@ch0-view    [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 &device $1 ]
44 
+@ch1-view    [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 &device $1 ]
45 
+@ch2-view    [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 &device $1 ]
46 
+@ch3-view    [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 &device $1 ]
47 
+
48 
+( program )
49 
+
50 
+|0100 ( -> )
51 
+
52 
+	( theme )
53 
+	#20fe .System/r DEO2
54 
+	#c0f3 .System/g DEO2
55 
+	#a0f2 .System/b DEO2
56 
+
57 
+	( vectors )
58 
+	;on-mouse .Mouse/vector DEO2
59 
+	;on-frame .Screen/vector DEO2
60 
+	;on-midi .Midi/vector DEO2
61 
+
62 
+	( find center )
63 
+	.Screen/width DEI2 2/ .center/x POK2
64 
+	.Screen/height DEI2 2/ .center/y POK2
65 
+
66 
+	( place views )
67 
+	.center/x PEK2 VIEW-WIDTH 2/ SUB2 .ch0-view/x1 POK2
68 
+	.center/y PEK2 VIEW-HEIGHT 2* SUB2 .ch0-view/y1 POK2
69 
+	.ch0-view/x1 PEK2 VIEW-WIDTH ADD2 .ch0-view/x2 POK2
70 
+	.ch0-view/y1 PEK2 VIEW-HEIGHT ADD2 .ch0-view/y2 POK2
71 
+
72 
+	.ch0-view/x1 PEK2 .ch1-view/x1 POK2
73 
+	.ch0-view/y1 PEK2 VIEW-HEIGHT ADD2 .ch1-view/y1 POK2
74 
+	.ch0-view/x2 PEK2 .ch1-view/x2 POK2
75 
+	.ch0-view/y2 PEK2 VIEW-HEIGHT ADD2 .ch1-view/y2 POK2
76 
+
77 
+	.ch1-view/x1 PEK2 .ch2-view/x1 POK2
78 
+	.ch1-view/y1 PEK2 VIEW-HEIGHT ADD2 .ch2-view/y1 POK2
79 
+	.ch1-view/x2 PEK2 .ch2-view/x2 POK2
80 
+	.ch1-view/y2 PEK2 VIEW-HEIGHT ADD2 .ch2-view/y2 POK2
81 
+
82 
+	.ch2-view/x1 PEK2 .ch3-view/x1 POK2
83 
+	.ch2-view/y1 PEK2 VIEW-HEIGHT ADD2 .ch3-view/y1 POK2
84 
+	.ch2-view/x2 PEK2 .ch3-view/x2 POK2
85 
+	.ch2-view/y2 PEK2 VIEW-HEIGHT ADD2 .ch3-view/y2 POK2
86 
+
87 
+	.Audio0 .ch0-view/device POK
88 
+	.Audio1 .ch1-view/device POK
89 
+	.Audio2 .ch2-view/device POK
90 
+	.Audio3 .ch3-view/device POK
91 
+
92 
+	#88 .Audio0/volume DEO
93 
+	#88 .Audio1/volume DEO
94 
+	#88 .Audio2/volume DEO
95 
+	#88 .Audio3/volume DEO
96 
+
97 
+	( defaults )
98 
+	;wave0 .Audio0/addr DEO2
99 
+	;wave1 .Audio1/addr DEO2
100 
+	;wave2 .Audio2/addr DEO2
101 
+	;wave3 .Audio3/addr DEO2
102 
+
103 
+	#00a8 .Audio0/length DEO2
104 
+	#00a8 .Audio1/length DEO2
105 
+	#00a8 .Audio2/length DEO2
106 
+	#00a8 .Audio3/length DEO2
107 
+
108 
+	#012c .Audio0/adsr DEO2
109 
+	#012c .Audio1/adsr DEO2
110 
+	#0113 .Audio2/adsr DEO2
111 
+	#112c .Audio3/adsr DEO2
112 
+
113 
+	;redraw JSR2
114 
+
115 
+BRK
116 
+
117 
+@on-frame ( -> )
118 
+
119 
+	.ch0-view ;draw-meter JSR2
120 
+	.ch1-view ;draw-meter JSR2
121 
+	.ch2-view ;draw-meter JSR2
122 
+	.ch3-view ;draw-meter JSR2
123 
+
124 
+BRK
125 
+
126 
+@on-midi ( -> )
127 
+
128 
+	.Midi/note DEI #00 NEQ ,&note-on JNZ BRK &note-on
129 
+	.Midi/note DEI .Audio0/pitch .Midi/channel DEI #04 MOD #10 MUL ADD DEO
130 
+
131 
+BRK
132 
+
133 
+@on-mouse ( -> )
134 
+
135 
+	;draw-cursor JSR2
136 
+
137 
+	.Mouse/state DEI #00 NEQ ,&on-touch JNZ BRK &on-touch
138 
+
139 
+	( get channel id )
140 
+	.Mouse/y DEI2 .ch0-view/y1 PEK2 SUB2 VIEW-HEIGHT DIV2 SWP POP
141 
+	#10 MUL
142 
+	.Audio0/pitch ADD
143 
+	#3c SWP DEO
144 
+
145 
+	( release ) #00 .Mouse/state DEO
146 
+
147 
+BRK
148 
+
149 
+@redraw ( -- )
150 
+
151 
+	.ch0-view ;draw-view JSR2
152 
+	.ch1-view ;draw-view JSR2
153 
+	.ch2-view ;draw-view JSR2
154 
+	.ch3-view ;draw-view JSR2
155 
+
156 
+RTN
157 
+
158 
+@draw-meter ( view* -- )
159 
+
160 
+	STH
161 
+	( y1 ) DUPr STHr #02 ADD PEK2 .Screen/y DEO2
162 
+
163 
+	( x1 ) DUPr STHr PEK2
164 
+		 #0010 ADD2 .Screen/x DEO2
165 
+	( device ) DUPr STHr #08 ADD PEK ( get addr ) #02 ADD DEI #04 SFT TOS #0008 MUL2 ;meter ADD2 .Screen/addr DEO2
166 
+		#21 .Screen/color DEO
167 
+	( x1 ) DUPr STHr PEK2
168 
+		 #0018 ADD2 .Screen/x DEO2
169 
+	( device ) DUPr STHr #08 ADD PEK ( get addr ) #02 ADD DEI #04 AND TOS #0008 MUL2 ;meter ADD2 .Screen/addr DEO2
170 
+		#21 .Screen/color DEO
171 
+
172 
+	POPr
173 
+
174 
+RTN
175 
+
176 
+@draw-view ( view* -- )
177 
+
178 
+	STH
179 
+
180 
+	( device id )
181 
+	( x1 ) DUPr STHr PEK2 .Screen/x DEO2
182 
+	( y1 ) DUPr STHr #02 ADD PEK2 .Screen/y DEO2
183 
+	( device ) DUPr STHr #08 ADD PEK #23 ;draw-byte JSR2
184 
+
185 
+	( x1 ) DUPr STHr PEK2 #0028 ADD2 .Screen/x DEO2
186 
+	;repeat .Screen/addr DEO2
187 
+	#23 .Screen/color DEO
188 
+
189 
+	( addr )
190 
+	( addr controls )
191 
+	( x1 ) DUPr STHr PEK2 #0060 ADD2 .Screen/x DEO2
192 
+	( device ) DUPr STHr #08 ADD PEK ( get addr ) #0c ADD DEI #21 ;draw-byte JSR2
193 
+	( x1 ) .Screen/x DEI2 #0008 ADD2 .Screen/x DEO2
194 
+	( device ) DUPr STHr #08 ADD PEK ( get addr ) #0d ADD DEI #21 ;draw-byte JSR2
195 
+
196 
+	( waveform )
197 
+	( volume knob )
198 
+	( x1 ) DUPr STHr PEK2
199 
+	( y1 ) DUPr STHr #02 ADD PEK2 #0010 ADD2
200 
+	( device ) DUPr STHr #08 ADD PEK ( get length ) #0e ADD DEI #04 SFT
201 
+	;draw-knob JSR2
202 
+
203 
+	( adsr knobs )
204 
+	( x1 ) DUPr STHr PEK2 #0018 ADD2
205 
+	( y1 ) DUPr STHr #02 ADD PEK2 #0010 ADD2
206 
+	( device ) DUPr STHr #08 ADD PEK ( get length ) #08 ADD DEI #04 SFT
207 
+	;draw-knob JSR2
208 
+	( x1 ) DUPr STHr PEK2 #0028 ADD2
209 
+	( y1 ) DUPr STHr #02 ADD PEK2 #0010 ADD2
210 
+	( device ) DUPr STHr #08 ADD PEK ( get length ) #08 ADD DEI #0f AND
211 
+	;draw-knob JSR2
212 
+	( x1 ) DUPr STHr PEK2 #0038 ADD2
213 
+	( y1 ) DUPr STHr #02 ADD PEK2 #0010 ADD2
214 
+	( device ) DUPr STHr #08 ADD PEK ( get length ) #09 ADD DEI #04 SFT
215 
+	;draw-knob JSR2
216 
+	( x1 ) DUPr STHr PEK2 #0048 ADD2
217 
+	( y1 ) DUPr STHr #02 ADD PEK2 #0010 ADD2
218 
+	( device ) DUPr STHr #08 ADD PEK ( get length ) #09 ADD DEI #0f AND
219 
+	;draw-knob JSR2
220 
+
221 
+	( meter )
222 
+	( test button )
223 
+
224 
+	( outline )
225 
+	( x1 ) DUPr STHr PEK2 #0006 SUB2
226 
+	( y1 ) DUPr STHr #02 ADD PEK2 #0006 SUB2
227 
+	( x2 ) DUPr STHr #04 ADD PEK2
228 
+	( y2 ) DUPr STHr #06 ADD PEK2 #000a SUB2
229 
+	#02 ;line-rect JSR2
230 
+
231 
+	( x1 ) DUPr STHr PEK2 #0060 ADD2 .Screen/x DEO2
232 
+
233 
+	( waveform )
234 
+	#00 #a8
235 
+	&loop
236 
+		( dotted line )
237 
+		OVR #01 AND ,&no-dot JNZ
238 
+			( y1 ) DUPr STHr #02 ADD PEK2 [ ] #0018 ADD2 .Screen/y DEO2
239 
+			#03 .Screen/color DEO
240 
+		&no-dot
241 
+		OVR TOS ( device ) DUPr STHr #08 ADD PEK ( get addr ) #0c ADD DEI2 ADD2 GET
242 
+		#02 DIV #40 ADD DUP #07 SFT #80 MUL SUB
243 
+		TOS #0004 DIV2 ( y1 ) DUPr STHr #02 ADD PEK2 [ ] ADD2 #0008 ADD2 .Screen/y DEO2
244 
+		.Screen/x DEI2 ++ .Screen/x DEO2
245 
+		( draw ) #01 .Screen/color DEO
246 
+		( incr ) SWP #01 ADD SWP
247 
+		DUP2 LTH ,&loop JNZ
248 
+	POP2
249 
+	( loop button )
250 
+	POPr
251 
+
252 
+RTN
253 
+
254 
+@draw-knob ( x* y* value -- )
255 
+
256 
+	( load ) .knob/value POK .knob/y POK2 .knob/x POK2
257 
+
258 
+	.knob/x PEK2 .Screen/x DEO2
259 
+	.knob/y PEK2 .Screen/y DEO2 ;knob_icns .Screen/addr DEO2 #21 .Screen/color DEO
260 
+	.knob/x PEK2 8+ .Screen/x DEO2 ;knob_icns 8+ .Screen/addr DEO2 #21 .Screen/color DEO
261 
+	.knob/y PEK2 8+ .Screen/y DEO2 ;knob_icns #0018 ADD2 .Screen/addr DEO2 #21 .Screen/color DEO
262 
+	.knob/x PEK2 .Screen/x DEO2 ;knob_icns #0010 ADD2 .Screen/addr DEO2 #21 .Screen/color DEO
263 
+	.knob/x PEK2 #00 #00 .knob/value PEK ;knob-offsetx ADD2 GET ADD2 .Screen/x DEO2
264 
+	.knob/y PEK2 #00 #00 .knob/value PEK ;knob-offsety ADD2 GET ADD2 .Screen/y DEO2
265 
+	;knob_icns #0020 ADD2 .Screen/addr DEO2
266 
+	#25 .Screen/color DEO
267 
+	.knob/x PEK2 #0004 ADD2 .Screen/x DEO2
268 
+	.knob/y PEK2 #0010 ADD2 .Screen/y DEO2
269 
+	;font-hex #00 .knob/value PEK #08 MUL ADD2 .Screen/addr DEO2
270 
+	#21 .Screen/color DEO
271 
+
272 
+RTN
273 
+
274 
+@draw-cursor ( -- )
275 
+
276 
+	( clear last cursor )
277 
+	;clear .Screen/addr DEO2
278 
+	.pointer/x PEK2 .Screen/x DEO2
279 
+	.pointer/y PEK2 .Screen/y DEO2
280 
+	#30 .Screen/color DEO
281 
+	( record pointer positions )
282 
+	.Mouse/x DEI2 .pointer/x POK2
283 
+	.Mouse/y DEI2 .pointer/y POK2
284 
+	( draw new cursor )
285 
+	;cursor .Screen/addr DEO2
286 
+	.pointer/x PEK2 .Screen/x DEO2
287 
+	.pointer/y PEK2 .Screen/y DEO2
288 
+	( colorize on state )
289 
+	#31 [ .Mouse/state DEI #00 NEQ ] ADD .Screen/color DEO
290 
+
291 
+RTN
292 
+
293 
+@draw-short ( short color -- )
294 
+
295 
+	.color POK
296 
+	.addr POK2
297 
+	;font-hex #00 ;addr GET #f0 AND #04 SFT #08 MUL ADD2 .Screen/addr DEO2
298 
+	( draw ) DUPr STHr .Screen/color DEO
299 
+	.Screen/x DEI2 8+ .Screen/x DEO2
300 
+	;font-hex #00 ;addr GET #0f AND #08 MUL ADD2 .Screen/addr DEO2
301 
+	( draw ) DUPr STHr .Screen/color DEO
302 
+	.Screen/x DEI2 8+ .Screen/x DEO2
303 
+	;font-hex #00 ;addr ++ GET #f0 AND #04 SFT #08 MUL ADD2 .Screen/addr DEO2
304 
+	( draw ) DUPr STHr .Screen/color DEO
305 
+	.Screen/x DEI2 8+ .Screen/x DEO2
306 
+	;font-hex STHr ;addr ++ GET #0f AND #08 MUL ADD2 .Screen/addr DEO2
307 
+	( draw ) #22 .Screen/color DEO
308 
+
309 
+RTN
310 
+
311 
+@draw-byte ( byte color -- )
312 
+
313 
+	.color POK STH
314 
+	;font-hex #00 DUPr STHr #f0 AND #04 SFT #08 MUL ADD2 .Screen/addr DEO2
315 
+	( draw ) .color PEK .Screen/color DEO
316 
+	.Screen/x DEI2 8+ .Screen/x DEO2
317 
+	;font-hex #00 STHr #0f AND #08 MUL ADD2 .Screen/addr DEO2
318 
+	( draw ) .color PEK .Screen/color DEO
319 
+
320 
+RTN
321 
+
322 
+@line-rect ( x1 y1 x2 y2 color -- )
323 
+
324 
+	( load ) .color POK DUP2 STH2 .rect/y2 POK2 .rect/x2 POK2 DUP2 STH2 .rect/y1 POK2 .rect/x1 POK2
325 
+	STH2r STH2r
326 
+	&ver
327 
+		( save ) OVR2 .Screen/y DEO2
328 
+		( draw ) .rect/x1 PEK2 .Screen/x DEO2 .color PEK DUP .Screen/color DEO
329 
+		( draw ) .rect/x2 PEK2 .Screen/x DEO2 .Screen/color DEO
330 
+		( incr ) SWP2 ++ SWP2
331 
+		OVR2 OVR2 LTS2 ,&ver JNZ
332 
+	POP2 POP2
333 
+	.rect/x1 PEK2 .rect/x2 PEK2
334 
+	&hor
335 
+		( save ) OVR2 .Screen/x DEO2
336 
+		( draw ) .rect/y1 PEK2 .Screen/y DEO2 .color PEK DUP .Screen/color DEO
337 
+		( draw ) .rect/y2 PEK2 .Screen/y DEO2 .Screen/color DEO
338 
+		( incr ) SWP2 ++ SWP2
339 
+		OVR2 OVR2 ++ LTS2 ,&hor JNZ
340 
+	POP2 POP2
341 
+
342 
+RTN
343 
+
344 
+@repeat [
345 
+	0038 4482 9282 4438 ]
346 
+
347 
+@clear  [
348 
+	0000 0000 0000 0000 ]
349 
+
350 
+@cursor [
351 
+	80c0 e0f0 f8e0 1000 ]
352 
+
353 
+@knob_icns [
354 
+	0003 0c10 2020 4040
355 
+	00c0 3008 0404 0202
356 
+	4040 2020 100c 0300
357 
+	0202 0404 0830 c000
358 
+	0000 183c 3c18 0000 ]
359 
+
360 
+@knob-offsetx [
361 
+	01 00 00 00 00 01 02 03
362 
+	05 06 07 08 08 08 08 07 ]
363 
+
364 
+@knob-offsety [
365 
+	07 06 05 03 02 01 00 00
366 
+	00 00 01 02 03 05 06 07 ]
367 
+
368 
+@meter [
369 
+	0000 0000 0000 0000
370 
+	0000 0000 0000 0070
371 
+	0000 0000 0000 007e
372 
+	0000 0000 0000 707e
373 
+	0000 0000 0070 7e7e
374 
+	0000 0000 007e 7e7e
375 
+	0000 0000 707e 7e7e
376 
+	0000 0000 7e7e 7e7e
377 
+	0000 0070 7e7e 7e7e
378 
+	0000 007e 7e7e 7e7e
379 
+	0000 707e 7e7e 7e7e
380 
+	0000 7e7e 7e7e 7e7e
381 
+	0070 7e7e 7e7e 7e7e
382 
+	007e 7e7e 7e7e 7e7e
383 
+	707e 7e7e 7e7e 7e7e
384 
+	7e7e 7e7e 7e7e 7e7e ]
385 
+
386 
+@font-hex ( 0-F )
387 
+[
388 
+	007c 8282 8282 827c 0030 1010 1010 1010
389 
+	007c 8202 7c80 80fe 007c 8202 1c02 827c
390 
+	000c 1424 4484 fe04 00fe 8080 7c02 827c
391 
+	007c 8280 fc82 827c 007c 8202 1e02 0202
392 
+	007c 8282 7c82 827c 007c 8282 7e02 827c
393 
+	007c 8202 7e82 827e 00fc 8282 fc82 82fc
394 
+	007c 8280 8080 827c 00fc 8282 8282 82fc
395 
+	007c 8280 f080 827c 007c 8280 f080 8080 ]
396 
+
397 
+@wave0 ( 0-F )
398 
+[
399 
+	0004 090e 1217 1c20 2529 2e32 363b 3f43
400 
+	474b 4e52 5659 5c60 6365 686b 6d70 7274
401 
+	7677 797a 7b7c 7d7e 7e7e 7e7e 7e7e 7d7c
402 
+	7b7a 7978 7674 7270 6e6b 6966 6360 5d5a
403 
+	5753 4f4c 4844 403c 3833 2f2a 2621 1d18
404 
+	140f 0a05 01fc f7f2 eee9 e4e0 dbd7 d2ce
405 
+	cac5 c1bd b9b5 b1ae aaa7 a3a0 9d9a 9795
406 
+	9290 8e8c 8a88 8785 8483 8282 8181 8181
407 
+	8181 8282 8384 8687 898a 8c8e 9193 9598
408 
+	9b9e a1a4 a8ab afb2 b6ba bec2 c6cb cfd3
409 
+	d8dc e1e6 eaef f4f8 ]
410 
+
411 
+@wave1 ( 0-F )
412 
+[
413 
+	0002 0406 080a 0c0e 1012 1416 181a 1c1e
414 
+	2022 2426 282a 2c2e 3032 3436 383a 3c3e
415 
+	4041 4345 4749 4b4d 4f51 5355 5759 5b5d
416 
+	5f61 6365 6769 6b6d 6f71 7375 7779 7b7d
417 
+	7f7d 7b79 7775 7371 6f6d 6b69 6765 6361
418 
+	5f5d 5b59 5755 5351 4f4d 4b49 4745 4341
419 
+	403e 3c3a 3836 3432 302e 2c2a 2826 2422
420 
+	201e 1c1a 1816 1412 100e 0c0a 0806 0402
421 
+	00fe fcfa f8f6 f4f2 f0ee ecea e8e6 e4e2
422 
+	e0de dcda d8d6 d4d2 d0ce ccca c8c6 c4c2
423 
+	c1bf bdbb b9b7 b5b3 ]
424 
+
425 
+@wave2 ( 0-F )
426 
+[
427 
+	4f4d 4b49 4745 4341 c1bf bdbb b9b7 b5b3
428 
+	403e 3c3a 3836 3432 302e 2c2a 2826 2422
429 
+	201e 1c1a 1816 1412 100e 0c0a 0806 0402
430 
+	00fe fcfa f8f6 f4f2 f0ee ecea e8e6 e4e2
431 
+	e0de dcda d8d6 d4d2 d0ce ccca c8c6 c4c2
432 
+	7b7a 7978 7674 7270 6e6b 6966 6360 5d5a
433 
+	5753 4f4c 4844 403c 3833 2f2a 2621 1d18
434 
+	140f 0a05 01fc f7f2 eee9 e4e0 dbd7 d2ce
435 
+	cac5 c1bd b9b5 b1ae aaa7 a3a0 9d9a 9795
436 
+	9290 8e8c 8a88 8785 8483 8282 8181 8181
437 
+	8181 8282 8384 8687 898a 8c8e 9193 9598
438 
+	9b9e a1a4 a8ab afb2
439 
+	 ]
440 
+
441 
+@wave3 ( 0-F )
442 
+[
443 
+	0004 090e 1217 1c20 2529 2e32 363b 3f43
444 
+	5753 4f4c 4844 403c 3833 2f2a 2621 1d18
445 
+	140f 0a05 01fc f7f2 eee9 e4e0 dbd7 d2ce
446 
+	cac5 c1bd b9b5 b1ae aaa7 a3a0 9d9a 9795
447 
+	5753 4f4c 4844 403c 3833 2f2a 2621 1d18
448 
+	140f 0a05 01fc f7f2 eee9 e4e0 dbd7 d2ce
449 
+	cac5 c1bd b9b5 b1ae aaa7 a3a0 9d9a 9795
450 
+	9290 8e8c 8a88 8785 8483 8282 8181 8181
451 
+	8181 8282 8384 8687 898a 8c8e 9193 9598
452 
+	9b9e a1a4 a8ab afb2 b6ba bec2 c6cb cfd3
453 
+	d8dc e1e6 eaef f4f8 ]
0 454 
\ No newline at end of file
src/emulator.c
History View file @ 67dfbc1
... ... 
@@ -254,8 +254,7 @@ audio_talk(Device *d, Uint8 b0, Uint8 w)
254 254 
 	Apu *c = &apu[d - devaudio0];
255 255 
 	if(!w && b0 == 0x2) {
256 256 
 		d->dat[0x2] = apu_get_vu(c);
257 
-	}
258 
-	else if(w && b0 == 0xf) {
257 
+	} else if(w && b0 == 0xf) {
259 258 
 		SDL_LockAudioDevice(audio_id);
260 259 
 		c->len = mempeek16(d->dat, 0xa);
261 260 
 		c->addr = &d->mem[mempeek16(d->dat, 0xc)];
... ... 
@@ -342,7 +341,9 @@ start(Uxn *u)
342 341 
 		}
343 342 
 		listenmpu(&mpu);
344 343 
 		for(i = 0; i < mpu.queue; ++i) {
345 
-			mempoke16(devmidi->dat, 2, mpu.events[i].message);
344 
+			devmidi->dat[2] = mpu.events[i].message;
345 
+			devmidi->dat[3] = mpu.events[i].message >> 8;
346 
+			devmidi->dat[4] = mpu.events[i].message >> 16;
346 347 
 			evaluxn(u, mempeek16(devmidi->dat, 0));
347 348 
 		}
348 349 
 		evaluxn(u, mempeek16(devscreen->dat, 0));