1 files changed, 44 insertions, 43 deletions

diff --git a/src/main.c b/src/main.c
index 6e7d3e5..a5a0628 100644
--- a/src/main.c
+++ b/src/main.c
@@ -112,37 +112,46 @@ screen_talk(Device *d, u8 b0, u8 w) {
     }
 }
 
-static u8 buf[KB(1)];
-
 static void
 audio_talk(Device *d, u8 b0, u8 w) {
-        AudioChannel *c = &apu.chan_0;
+        AudioChannel *c = &channels[0];
         if(!w) {
                 if(b0 == 0x2) {
-                        mempoke16(d->dat, 0x2, c->position);
+                        mempoke16(d->dat, 0x2, c->pos);
+                        c->pos <<= 12; // fixed point.
         } else if(b0 == 0x4) {
                         // d->dat[0x4] = apu_get_vu(c);
         }
         } else if(b0 == 0xf) {
-                // SDL_LockAudioDevice(audio_id);
-                c->n_samples = mempeek16(d->dat, 0xa);
-                c->samples = &d->mem[mempeek16(d->dat, 0xc)];
-                // Transform the samples from u8 to s8.
-                for (size_t i = 0; i < c->n_samples; ++i) {
-                    buf[i] = (u8)c->samples[i] + 0x80;
-                }
-                c->samples = &buf;
+            // Disable the channel before updating.
+                c->data = NULL;
+
+                // Initialization.
+        c->inc = (44100 << 12) / AUDIO_FREQ;
+        c->pos = 0;
+
+        // Data.
+                c->length = mempeek16(d->dat, 0xa);
+                c->length <<= 12; // fixed point.
+                c->data = &d->mem[mempeek16(d->dat, 0xc)];
+
+        // TODO: Volume.
+        c->vol = 12; // 0-64
                 // c->volume[0] = d->dat[0xe] >> 4;
                 // c->volume[1] = d->dat[0xe] & 0xf;
-                c->loop = !(d->dat[0xf] & 0x80);
+
+                // Looping.
+                if (!(d->dat[0xf] & 0x80)) {
+            c->loop_length = c->length;
+        } else {
+            c->loop_length = 0;
+        }
+
+        // Pitch
                 c->pitch = d->dat[0xf] & 0x7f;
-            // init_sound(c);
-            reset_sound(c);
+            txt_position(0, 0);
         txt_printf("note: %d     \n", c->pitch);
-                // apu_start(c, mempeek16(d->dat, 0x8), d->dat[0xf] & 0x7f);
-                // SDL_UnlockAudioDevice(audio_id);
         }
-        // txt_printf("AUDIO TALK: %d\n", d);
 }
 
 void
@@ -401,41 +410,33 @@ int main(void) {
     txt_position(0,0);
 
     init_sound();
-    // reset_sound(&apu.chan_0);
-    // txt_printf("DING\n");
-    // sound_mix();
 
     // Main loop.
     int frame_counter = 0;
-    // evaluxn(&u, 0x0100);
-    // u32 flip_cycles = 0;
+    evaluxn(&u, 0x0100);
+    u32 flip_cycles = 0;
     while(true) {
         bios_vblank_wait();
-        // profile_start();
-        // handle_input(&u);
-        // u32 input_cycles = profile_stop();
-        // profile_start();
-        // evaluxn(&u, mempeek16(devscreen->dat, 0));
-        // u32 eval_cycles = profile_stop();
-        // txt_position(0, 8);
-        // txt_printf("INPUT: %lu  \n", input_cycles);
-        // txt_printf("EVAL:  %lu  \n", eval_cycles);
-        // txt_printf("FLIP:  %lu  \n", flip_cycles);
-        // profile_start();
-        // flip_cycles = profile_stop();
+        profile_start();
+        handle_input(&u);
+        u32 input_cycles = profile_stop();
+        profile_start();
+        evaluxn(&u, mempeek16(devscreen->dat, 0));
+        u32 eval_cycles = profile_stop();
+        txt_position(0, 8);
+        profile_start();
+        flip_cycles = profile_stop();
         frame_counter++;
-        // if (frame_counter == 120) {
-        //     init_sound(&apu.chan_0);
-        //     reset_sound(&apu.chan_0);
-        //     frame_counter = 0;
-        // }
         profile_start();
         sound_mix();
         u32 mix_cycles = profile_stop();
 
-        txt_position(0, 18);
-        txt_printf("MIX CYCLES: %lu   \n", mix_cycles);
-        txt_printf("FRAME: %lu   \n", frame_counter);
+        txt_position(0, 15);
+        txt_printf("INPUT: %lu    \n", input_cycles);
+        txt_printf("EVAL:  %lu    \n", eval_cycles);
+        txt_printf("FLIP:  %lu    \n", flip_cycles);
+        txt_printf("MIX:   %lu    \n", mix_cycles);
+        txt_printf("FRAME: %lu    \n", frame_counter);
         flipbuf(&ppu);
     }