1 files changed, 7 insertions, 39 deletions

diff --git a/src/main.c b/src/main.c
index aee68f8..35bc0cf 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,7 +20,7 @@ WITH REGARD TO THIS SOFTWARE.
 #include "uxn/uxn.c"
 #include "uxn/devices/ppu.h"
 #include "uxn/devices/ppu.c"
-#include "uxn/devices/apu.c"
+#include "apu.c"
 
 #include "text.h"
 
@@ -124,44 +124,12 @@ audio_talk(Device *d, u8 b0, u8 w) {
         }
         } else if(b0 == 0xf) {
         u16 length = mempeek16(d->dat, 0xa);
-
-            // Disable the channel before updating.
-                c->data = NULL;
-
-        // Data.
-        c->pos = 0;
-                c->length = length;
-                c->length <<= 12; // fixed point.
-                c->data = &d->mem[mempeek16(d->dat, 0xc)];
-
-        // Volume (Mono only for now).
-        c->vol = MAX(d->dat[0xe] >> 4, d->dat[0xe] & 0xf); // 0-64
-        c->vol *= 4 / 3;
-
-                // Looping.
-                if (!(d->dat[0xf] & 0x80)) {
-            c->loop_length = c->length;
-        } else {
-            c->loop_length = 0;
-        }
-
-        // Pitch
-                c->pitch = d->dat[0xf] & 0x7f;
-
-                // Initialization.
-                u32 sampling_rate = length;
-                if (length > 256) {
-                    sampling_rate = 44100;
-        }
-        c->inc = (pitch_table[c->pitch] * sampling_rate) >> 5;
-
+        u8 *data = &d->mem[mempeek16(d->dat, 0xc)];
+        u8 pitch = d->dat[0xf] & 0x7f;
         u16 adsr = mempeek16(d->dat, 0x8);
-        build_adsr(c, adsr);
-            txt_position(0, 0);
-        txt_printf("note:   %d     \n", c->pitch);
-        txt_printf("inc:    %lu    \n", c->inc);
-        txt_printf("length: %lu    \n", c->length >> 12);
-        txt_printf("chan:   %lu    \n", d - devaudio);
+        u32 vol = MAX(d->dat[0xe] >> 4, d->dat[0xe] & 0xf) * 4 / 3;
+        bool loop = !(d->dat[0xf] & 0x80);
+        update_channel(c, data, length, pitch, adsr, vol, loop);
         }
 }
 
@@ -412,7 +380,7 @@ int main(void) {
     // irs_set(IRQ_TIMER_1, irs_stop_sample);
 
     // Initialize VM.
-    memset(&u, 0, sizeof(u));
+    dma_fill(&u, 0, sizeof(u), 3);
     u.ram.dat = umem;
     init_uxn(&u);