Adding notes to audio track is working
This commit is contained in:
neauoire
parent
e7be81d678
commit
eb3026cde0
2
build.sh
2
build.sh
|
|
@ -28,7 +28,7 @@ else
|
|||
fi
|
||||
|
||||
echo "Assembling.."
|
||||
./bin/assembler projects/examples/dev.time.usm bin/boot.rom
|
||||
./bin/assembler projects/examples/dev.audio.usm bin/boot.rom
|
||||
|
||||
echo "Running.."
|
||||
if [ "${2}" = '--cli' ];
|
||||
|
|
|
|||
|
|
@ -2,12 +2,19 @@
|
|||
|
||||
%RTN { JMP2r }
|
||||
%8+ { #0008 ADD2 } %8- { #0008 SUB2 }
|
||||
%++ { #0001 ADD2 }
|
||||
%MOD { DUP2 DIV MUL SUB }
|
||||
|
||||
( variables )
|
||||
|
||||
;pointer { x 2 y 2 }
|
||||
;color { byte 1 }
|
||||
;rect { x1 2 y1 2 x2 2 y2 2 }
|
||||
;frame { x1 2 y1 2 x2 2 y2 2 }
|
||||
;label { x 2 y 2 color 1 addr 2 }
|
||||
;knob { x 2 y 2 value 1 }
|
||||
;head { pos 1 }
|
||||
;track { ch1 20 ch2 20 ch3 20 ch4 20 }
|
||||
|
||||
( devices )
|
||||
|
||||
|
|
@ -28,15 +35,49 @@
|
|||
|
||||
@RESET
|
||||
|
||||
( theme ) #f0fd =System.r #f0f3 =System.g #f0f2 =System.b
|
||||
( theme ) #f0fd =System.r #f0c3 =System.g #f032 =System.b
|
||||
|
||||
~Screen.width #0002 DIV2 #0080 SUB2 =frame.x1
|
||||
~Screen.height #0002 DIV2 #0038 SUB2 =frame.y1
|
||||
~Screen.width #0002 DIV2 #0080 ADD2 =frame.x2
|
||||
~Screen.height #0002 DIV2 #0038 ADD2 =frame.y2
|
||||
|
||||
,draw-timeline JSR2
|
||||
,draw-controls JSR2
|
||||
|
||||
BRK
|
||||
|
||||
@FRAME
|
||||
|
||||
|
||||
,draw-cursor JSR2
|
||||
,move-head JSR2
|
||||
|
||||
~head.pos #08 MOD #00 NEQ ^$skip JNZ
|
||||
,bang JSR2
|
||||
,draw-position JSR2
|
||||
$skip
|
||||
|
||||
|
||||
~Mouse.state #00 EQU ,$click-end JNZ2
|
||||
|
||||
~Mouse.x ~frame.x1 GTH2 ~Mouse.x ~frame.x2 LTH2 #0101 EQU2
|
||||
~Mouse.y ~frame.y1 GTH2 ~Mouse.y ~frame.y2 LTH2 #0101 EQU2
|
||||
#0101 NEQ2 ,$no-track-click JNZ2
|
||||
,clear-notes JSR2
|
||||
( get note )
|
||||
#0e ~Mouse.y ~frame.y1 SUB2 SWP POP #08 DIV SUB
|
||||
~Mouse.state #10 NEQ ^$no-erase JNZ
|
||||
POP #00
|
||||
$no-erase
|
||||
( get track )
|
||||
,track.ch1 #00 ~Mouse.x ~frame.x1 SUB2 SWP POP #08 DIV ADD2
|
||||
POK2
|
||||
( release ) #00 =Mouse.state
|
||||
,draw-notes JSR2
|
||||
,draw-bars JSR2
|
||||
$no-track-click
|
||||
|
||||
$click-end
|
||||
|
||||
BRK
|
||||
|
||||
|
|
@ -44,25 +85,92 @@ BRK
|
|||
|
||||
BRK
|
||||
|
||||
@bang ( -- )
|
||||
(
|
||||
~head.pos #08 DIV =Console.byte
|
||||
,track.ch1 #00 ~head.pos #08 DIV ADD2 PEK2 =Console.byte
|
||||
)
|
||||
|
||||
RTN
|
||||
|
||||
@move-head ( -- )
|
||||
|
||||
( clear )
|
||||
~frame.y1 #0008 SUB2 =Sprite.y
|
||||
~frame.x1 #00 ~head.pos ADD2 =Sprite.x
|
||||
,head_icn =Sprite.addr
|
||||
#00 =Sprite.color
|
||||
( incr ) ~head.pos #01 ADD =head.pos
|
||||
( draw )
|
||||
~frame.x1 #00 ~head.pos ADD2 =Sprite.x
|
||||
,head_icn =Sprite.addr
|
||||
#01 =Sprite.color
|
||||
|
||||
RTN
|
||||
|
||||
@draw-position ( -- )
|
||||
|
||||
~frame.x2 #0008 SUB2 =Sprite.x
|
||||
~frame.y1 #0010 SUB2 =Sprite.y
|
||||
,font_hex #00 ~head.pos #10 DIV #0008 MUL2 ADD2 =Sprite.addr
|
||||
#01 =Sprite.color
|
||||
|
||||
RTN
|
||||
|
||||
@clear-notes ( -- )
|
||||
|
||||
#00 #20
|
||||
$loop
|
||||
( load ) OVR #00 SWP ,track.ch1 ADD2 PEK2
|
||||
#00 SWP #0e SWP SUB #0008 MUL2 ~frame.y1 ADD2 =Sprite.y
|
||||
OVR #00 SWP #0008 MUL2 ~frame.x1 ADD2 =Sprite.x
|
||||
#00 =Sprite.color
|
||||
( incr ) SWP #01 ADD SWP
|
||||
DUP2 LTH ^$loop JNZ
|
||||
POP2
|
||||
|
||||
RTN
|
||||
|
||||
@draw-notes ( -- )
|
||||
|
||||
#00 #20
|
||||
$notes-loop
|
||||
( load ) OVR #00 SWP ,track.ch1 ADD2 PEK2
|
||||
DUP STH #00 SWP #0e SWP SUB #0008 MUL2 ~frame.y1 ADD2 =Sprite.y
|
||||
OVR #00 SWP #0008 MUL2 ~frame.x1 ADD2 =Sprite.x
|
||||
,note2_icn =Sprite.addr
|
||||
#01 STHr #00 EQU SUB =Sprite.color
|
||||
( incr ) SWP #01 ADD SWP
|
||||
DUP2 LTH ^$notes-loop JNZ
|
||||
POP2
|
||||
|
||||
RTN
|
||||
|
||||
@draw-bars ( -- )
|
||||
|
||||
( draw notes )
|
||||
|
||||
#0040 =Sprite.y
|
||||
~frame.x1 ~frame.y1 ~frame.x2 ~frame.y2 #01 ,line-rect JSR2
|
||||
|
||||
( grid )
|
||||
~frame.y1 #0010 SUB2 =Sprite.y
|
||||
,font_hex =Sprite.addr
|
||||
#0000 #0100
|
||||
$loop
|
||||
OVR2 SWP POP #02 DIV #0f AND #00 NEQ ^$skip JNZ
|
||||
OVR2 #0060 ADD2 =Sprite.x
|
||||
OVR2 ~frame.x1 ADD2 =Sprite.x
|
||||
#01 =Sprite.color
|
||||
~Sprite.addr 8+ =Sprite.addr
|
||||
OVR2 #0060 ADD2 #0051 #00c1 #01 ,line-vertical-dotted JSR2
|
||||
OVR2 ~frame.x1 ADD2 ~frame.y1 #0001 ADD2 ~frame.y2 #01 ,line-vertical-dotted JSR2
|
||||
$skip
|
||||
OVR2 #0060 ADD2 #0050 #00c0 #01 ,line-vertical-dotted JSR2
|
||||
OVR2 ~frame.x1 ADD2 ~frame.y1 ~frame.y2 #01 ,line-vertical-dotted JSR2
|
||||
SWP2 #0008 ADD2 SWP2
|
||||
OVR2 OVR2 LTH2 ^$loop JNZ
|
||||
POP2
|
||||
POP2
|
||||
|
||||
~frame.x1 ~frame.x2 ~frame.y1 #0008 SUB2 #0040 ADD2 #01 ,line-horizontal-dotted JSR2
|
||||
|
||||
RTN
|
||||
|
||||
@draw-octave ( x y -- )
|
||||
|
|
@ -85,30 +193,27 @@ RTN
|
|||
POP2
|
||||
POP2
|
||||
|
||||
|
||||
RTN
|
||||
|
||||
@draw-octaves ( -- )
|
||||
|
||||
#0040 #0050 ,draw-octave JSR2
|
||||
#0040 #0088 ,draw-octave JSR2
|
||||
|
||||
#0028 =Sprite.x
|
||||
#0080 =Sprite.y
|
||||
~frame.x1 #0018 SUB2 ~frame.y1 ,draw-octave JSR2
|
||||
~frame.x1 #0018 SUB2 ~frame.y1 #0038 ADD2 ,draw-octave JSR2
|
||||
~frame.x1 #0028 SUB2 =Sprite.x
|
||||
~frame.y1 =Sprite.y
|
||||
,font_hex #0060 ADD2 =Sprite.addr
|
||||
#01 =Sprite.color
|
||||
#0030 =Sprite.x
|
||||
~frame.x1 #0030 SUB2 =Sprite.x
|
||||
,font_hex #0020 ADD2 =Sprite.addr
|
||||
#01 =Sprite.color
|
||||
~frame.x1 #0028 SUB2 =Sprite.x
|
||||
~frame.y1 #0038 ADD2 =Sprite.y
|
||||
,font_hex #0060 ADD2 =Sprite.addr
|
||||
#01 =Sprite.color
|
||||
~frame.x1 #0030 SUB2 =Sprite.x
|
||||
,font_hex #0018 ADD2 =Sprite.addr
|
||||
#01 =Sprite.color
|
||||
|
||||
#0028 =Sprite.x
|
||||
#00b8 =Sprite.y
|
||||
,font_hex #0060 ADD2 =Sprite.addr
|
||||
#01 =Sprite.color
|
||||
#0030 =Sprite.x
|
||||
,font_hex #0010 ADD2 =Sprite.addr
|
||||
#01 =Sprite.color
|
||||
|
||||
RTN
|
||||
|
||||
@draw-timeline ( -- )
|
||||
|
|
@ -118,14 +223,55 @@ RTN
|
|||
|
||||
RTN
|
||||
|
||||
@line-vertical-dotted ( x y0 y1 color -- )
|
||||
@draw-knob ( x* y* value -- )
|
||||
|
||||
=color STH2 SWP2 =Screen.x STH2r OVR2 =Screen.y
|
||||
$draw-ver
|
||||
( draw ) ~color =Screen.color
|
||||
( incr ) SWP2 #0002 ADD2 DUP2 =Screen.y SWP2
|
||||
OVR2 OVR2 LTH2 ^$draw-ver JNZ
|
||||
POP2 POP2
|
||||
=knob.value
|
||||
=knob.y
|
||||
=knob.x
|
||||
|
||||
~knob.x =Sprite.x
|
||||
~knob.y =Sprite.y
|
||||
,knob_icns =Sprite.addr
|
||||
#01 =Sprite.color
|
||||
|
||||
~knob.x 8+ =Sprite.x
|
||||
,knob_icns 8+ =Sprite.addr
|
||||
#01 =Sprite.color
|
||||
|
||||
~knob.y 8+ =Sprite.y
|
||||
,knob_icns #0018 ADD2 =Sprite.addr
|
||||
#01 =Sprite.color
|
||||
|
||||
~knob.x =Sprite.x
|
||||
,knob_icns #0010 ADD2 =Sprite.addr
|
||||
#01 =Sprite.color
|
||||
|
||||
~knob.x #0004 ADD2 =Sprite.x
|
||||
~knob.y #0001 ADD2 =Sprite.y
|
||||
,knob_icns #0020 ADD2 =Sprite.addr
|
||||
#05 =Sprite.color
|
||||
|
||||
~knob.x #0004 ADD2 =Sprite.x
|
||||
~knob.y #0010 ADD2 =Sprite.y
|
||||
,font_hex #00 ~knob.value #08 MUL ADD2 =Sprite.addr
|
||||
#01 =Sprite.color
|
||||
|
||||
RTN
|
||||
|
||||
@draw-controls ( -- )
|
||||
|
||||
~frame.x1 #0000 ADD2 ~frame.y2 #0008 ADD2 #01 ,ch1_txt ,draw-label JSR2
|
||||
~frame.x1 #0000 ADD2 ~frame.y2 #0010 ADD2 #01 ,env_txt ,draw-label JSR2
|
||||
|
||||
~frame.x1 #0000 ADD2 ~frame.y2 #0020 ADD2 #00 ,draw-knob JSR2
|
||||
~frame.x1 #0010 ADD2 ~frame.y2 #0020 ADD2 #02 ,draw-knob JSR2
|
||||
~frame.x1 #0020 ADD2 ~frame.y2 #0020 ADD2 #0a ,draw-knob JSR2
|
||||
~frame.x1 #0030 ADD2 ~frame.y2 #0020 ADD2 #0c ,draw-knob JSR2
|
||||
|
||||
~frame.x1 #0050 ADD2 ~frame.y2 #0010 ADD2 #01 ,vol_txt ,draw-label JSR2
|
||||
|
||||
~frame.x1 #0050 ADD2 ~frame.y2 #0020 ADD2 #00 ,draw-knob JSR2
|
||||
~frame.x1 #0060 ADD2 ~frame.y2 #0020 ADD2 #0f ,draw-knob JSR2
|
||||
|
||||
RTN
|
||||
|
||||
|
|
@ -148,9 +294,84 @@ RTN
|
|||
|
||||
RTN
|
||||
|
||||
( generics )
|
||||
|
||||
@draw-label ( x y color addr -- )
|
||||
|
||||
( load ) =label.addr =label.color =Sprite.y =Sprite.x
|
||||
~label.addr
|
||||
$loop
|
||||
( draw ) DUP2 PEK2 #00 SWP #0008 MUL2 ,font ADD2 =Sprite.addr ~label.color =Sprite.color
|
||||
( incr ) #0001 ADD2
|
||||
( incr ) ~Sprite.x #0008 ADD2 =Sprite.x
|
||||
DUP2 PEK2 #00 NEQ ^$loop JNZ
|
||||
POP2
|
||||
|
||||
RTN
|
||||
|
||||
@line-vertical-dotted ( x y0 y1 color -- )
|
||||
|
||||
=color STH2 SWP2 =Screen.x STH2r OVR2 =Screen.y
|
||||
$draw-ver
|
||||
( draw ) ~color =Screen.color
|
||||
( incr ) SWP2 #0002 ADD2 DUP2 =Screen.y SWP2
|
||||
OVR2 OVR2 LTH2 ^$draw-ver JNZ
|
||||
POP2 POP2
|
||||
|
||||
RTN
|
||||
|
||||
@line-horizontal-dotted ( x0 x1 y color -- )
|
||||
|
||||
=color =Screen.y OVR2 =Screen.x
|
||||
$draw-hor
|
||||
( draw ) ~color =Screen.color
|
||||
( incr ) SWP2 #0002 ADD2 DUP2 =Screen.x SWP2
|
||||
OVR2 OVR2 LTH2 ^$draw-hor JNZ
|
||||
POP2 POP2
|
||||
|
||||
RTN
|
||||
|
||||
@line-rect ( x1 y1 x2 y2 color )
|
||||
|
||||
( load ) =color =rect.y2 =rect.x2 DUP2 =Screen.y =rect.y1 DUP2 =Screen.x =rect.x1
|
||||
$hor
|
||||
( incr ) ~Screen.x ++ =Screen.x
|
||||
( draw ) ~rect.y1 =Screen.y ~color =Screen.color
|
||||
( draw ) ~rect.y2 =Screen.y ~color =Screen.color
|
||||
~Screen.x ~rect.x2 LTH2 ^$hor JNZ
|
||||
~rect.y1 =Screen.y
|
||||
$ver
|
||||
( draw ) ~rect.x1 =Screen.x ~color =Screen.color
|
||||
( draw ) ~rect.x2 =Screen.x ~color =Screen.color
|
||||
( incr ) ~Screen.y ++ =Screen.y
|
||||
~Screen.y ~rect.y2 ++ LTH2 ^$ver JNZ
|
||||
|
||||
RTN
|
||||
|
||||
@clear_icn [ 0000 0000 0000 0000 ]
|
||||
@cursor_icn [ 80c0 e0f0 f8e0 1000 ]
|
||||
|
||||
@note1_icn [ 0000 1c22 2222 1c00 ]
|
||||
@note2_icn [ 0000 1c3e 3e3e 1c00 ]
|
||||
@head_icn [ 0018 1818 7e3c 1800 ]
|
||||
|
||||
@ch1_txt [ Channel1 00 ]
|
||||
@env_txt [ Enveloppe 00 ]
|
||||
@vol_txt [ Volume 00 ]
|
||||
|
||||
@notes [
|
||||
60 61 62 63 64 65 66
|
||||
67 68 69 6a 6b 6c 6d
|
||||
]
|
||||
|
||||
@knob_icns [
|
||||
0003 0c10 2020 4040
|
||||
00c0 3008 0404 0202
|
||||
4040 2020 100c 0300
|
||||
0202 0404 0830 c000
|
||||
0000 183c 3c18 0000
|
||||
]
|
||||
|
||||
@piano-white [
|
||||
ffc0 8080 80c0 ff00
|
||||
fc02 0202 0202 fc00
|
||||
|
|
@ -189,3 +410,39 @@ RTN
|
|||
007c 8280 8080 827c 00fc 8282 8282 82fc
|
||||
007c 8280 f080 827c 007c 8280 f080 8080
|
||||
]
|
||||
|
||||
@font ( spectrum-zx font )
|
||||
[
|
||||
0000 0000 0000 0000 0000 2400 7e3c 0000 0000 2400 3c42 0000 0000 6c7c 7c38 1000
|
||||
0010 387c 7c38 1000 0038 387c 6c10 3800 0010 387c 7c10 3800 0000 0018 1800 0000
|
||||
007e 4242 4242 7e00 0000 1824 2418 0000 0018 2442 4224 1800 001e 063a 4a48 3000
|
||||
0038 446c 107c 1000 000c 0808 0838 3800 003e 2222 2266 6600 0000 0822 0022 0800
|
||||
0000 1018 1c18 1000 0000 0818 3818 0800 0008 1c00 001c 0800 0028 2828 2800 2800
|
||||
003e 4a4a 3a0a 0a00 000c 3046 620c 3000 0000 0000 0000 ffff 0010 3800 3810 0038
|
||||
0008 1c2a 0808 0800 0008 0808 2a1c 0800 0000 0804 7e04 0800 0000 1020 7e20 1000
|
||||
0000 4040 7e00 0000 0000 0024 6624 0000 0000 1038 7c00 0000 0000 007c 3810 0000
|
||||
0000 0000 0000 0000 0008 0808 0800 0800 0014 1400 0000 0000 0024 7e24 247e 2400
|
||||
0008 1e28 1c0a 3c08 0042 0408 1020 4200 0030 4832 4c44 3a00 0008 1000 0000 0000
|
||||
0004 0808 0808 0400 0010 0808 0808 1000 0000 1408 3e08 1400 0000 0808 3e08 0800
|
||||
0000 0000 0008 0810 0000 0000 3c00 0000 0000 0000 0000 0800 0000 0204 0810 2000
|
||||
003c 464a 5262 3c00 0018 2808 0808 3e00 003c 4202 3c40 7e00 003c 421c 0242 3c00
|
||||
0008 1828 487e 0800 007e 407c 0242 3c00 003c 407c 4242 3c00 007e 0204 0810 1000
|
||||
003c 423c 4242 3c00 003c 4242 3e02 3c00 0000 0008 0000 0800 0000 0800 0008 0810
|
||||
0000 0810 2010 0800 0000 003e 003e 0000 0000 1008 0408 1000 003c 4202 0c00 0800
|
||||
003c 425a 5442 3c00 0018 2442 7e42 4200 007c 427c 4242 7c00 003c 4240 4042 3c00
|
||||
0078 4442 4244 7800 007e 407c 4040 7e00 003e 4040 7c40 4000 003c 4240 4e42 3c00
|
||||
0042 427e 4242 4200 003e 0808 0808 3e00 0002 0202 4242 3c00 0044 4870 4844 4200
|
||||
0040 4040 4040 7e00 0042 665a 4242 4200 0042 6252 4a46 4200 003c 4242 4242 3c00
|
||||
007c 4242 7c40 4000 003c 4242 524a 3c00 007c 4242 7c44 4200 003c 403c 0242 3c00
|
||||
00fe 1010 1010 1000 0042 4242 4242 3c00 0042 4242 4224 1800 0042 4242 5a66 4200
|
||||
0042 2418 1824 4200 0082 4428 1010 1000 007e 0408 1020 7e00 000c 0808 0808 0c00
|
||||
0040 2010 0804 0200 0018 0808 0808 1800 0008 1422 0000 0000 0000 0000 0000 7e00
|
||||
0008 0400 0000 0000 0000 1c02 1e22 1e00 0020 203c 2222 3c00 0000 1e20 2020 1e00
|
||||
0002 021e 2222 1e00 0000 1c22 3c20 1e00 000c 101c 1010 1000 0000 1c22 221e 021c
|
||||
0020 202c 3222 2200 0008 0018 0808 0400 0008 0008 0808 4830 0020 2428 3028 2400
|
||||
0010 1010 1010 0c00 0000 6854 5454 5400 0000 5864 4444 4400 0000 3844 4444 3800
|
||||
0000 7844 4478 4040 0000 3c44 443c 0406 0000 2c30 2020 2000 0000 3840 3804 7800
|
||||
0010 103c 1010 0c00 0000 4444 4444 3800 0000 4444 2828 1000 0000 4454 5454 2800
|
||||
0000 4428 1028 4400 0000 4444 443c 0438 0000 7c08 1020 7c00 000c 0810 1008 0c00
|
||||
0008 0808 0808 0800 0030 1008 0810 3000 0000 0032 4c00 0000 3c42 99a1 a199 423c
|
||||
]
|
||||
|
|
@ -15,7 +15,7 @@ WITH REGARD TO THIS SOFTWARE.
|
|||
|
||||
#include "uxn.h"
|
||||
|
||||
#define HOR 64
|
||||
#define HOR 48
|
||||
#define VER 32
|
||||
#define PAD 2
|
||||
#define RES (HOR * VER * 16)
|
||||
|
|
@ -64,7 +64,7 @@ static Uint32 note_periods[12] = {
|
|||
(Uint32)0x9dcd * SAMPLE_FREQUENCY,
|
||||
(Uint32)0x94f2 * SAMPLE_FREQUENCY, /* A-1 */
|
||||
(Uint32)0x8c95 * SAMPLE_FREQUENCY,
|
||||
(Uint32)0x84b2 * SAMPLE_FREQUENCY /* B-1 */
|
||||
(Uint32)0x84b2 * SAMPLE_FREQUENCY /* B-1 */
|
||||
};
|
||||
|
||||
typedef struct audio_channel {
|
||||
|
|
@ -240,32 +240,34 @@ togglezoom(Uxn *u)
|
|||
}
|
||||
|
||||
Sint16
|
||||
audio_envelope(Channel *c) {
|
||||
if (c->age < c->a)
|
||||
audio_envelope(Channel *c)
|
||||
{
|
||||
if(c->age < c->a)
|
||||
return 0x0888 * c->age / c->a;
|
||||
else if (c->age < c->d)
|
||||
else if(c->age < c->d)
|
||||
return 0x0444 * (2 * c->d - c->a - c->age) / (c->d - c->a);
|
||||
else if (c->age < c->s)
|
||||
else if(c->age < c->s)
|
||||
return 0x0444;
|
||||
else if (c->age < c->r)
|
||||
else if(c->age < c->r)
|
||||
return 0x0444 * (c->r - c->age) / (c->r - c->s);
|
||||
else
|
||||
return 0x0000;
|
||||
}
|
||||
|
||||
void
|
||||
audio_callback(void* userdata, Uint8* stream, int len) {
|
||||
Sint16 *samples = (Sint16 *) stream;
|
||||
audio_callback(void *userdata, Uint8 *stream, int len)
|
||||
{
|
||||
Sint16 *samples = (Sint16 *)stream;
|
||||
int i, j;
|
||||
len >>= 2; /* use len for number of samples, not bytes */
|
||||
for (j = len * 2 - 1; j >= 0; --j) samples[j] = 0;
|
||||
for (i = 0; i < 4; ++i) {
|
||||
for(j = len * 2 - 1; j >= 0; --j) samples[j] = 0;
|
||||
for(i = 0; i < 4; ++i) {
|
||||
Channel *c = &channels[i];
|
||||
if (c->period < (1 << 20)) continue;
|
||||
for (j = 0; j < len; ++j) {
|
||||
if(c->period < (1 << 20)) continue;
|
||||
for(j = 0; j < len; ++j) {
|
||||
c->age += 1;
|
||||
c->count += 1 << 20;
|
||||
while (c->count > c->period) {
|
||||
while(c->count > c->period) {
|
||||
Sint16 mul;
|
||||
c->count -= c->period;
|
||||
c->phase = !c->phase;
|
||||
|
|
@ -277,13 +279,14 @@ audio_callback(void* userdata, Uint8* stream, int len) {
|
|||
samples[j * 2 + 1] += c->value[1];
|
||||
}
|
||||
}
|
||||
(void) userdata;
|
||||
(void)userdata;
|
||||
}
|
||||
|
||||
void
|
||||
silence(void) {
|
||||
silence(void)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < 4; ++i) {
|
||||
for(i = 0; i < 4; ++i) {
|
||||
Channel *c = &channels[i];
|
||||
c->volume[0] = 0;
|
||||
c->volume[1] = 0;
|
||||
|
|
@ -496,7 +499,7 @@ Uint8
|
|||
audio_poke(Uxn *u, Uint16 ptr, Uint8 b0, Uint8 b1)
|
||||
{
|
||||
Uint8 *m = u->ram.dat;
|
||||
if (b0 & 1) {
|
||||
if(b0 & 1) {
|
||||
Uint16 addr = ptr + (b0 & 0x6);
|
||||
Channel *c = &channels[(b0 & 0x6) >> 1];
|
||||
SDL_LockAudioDevice(audio_id);
|
||||
|
|
|
|||
Loading…
Reference in New Issue