1 files changed, 9 insertions, 3 deletions

diff --git a/src/main.c b/src/main.c
index fa82999..222ffd4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -114,7 +114,7 @@ screen_talk(Device *d, u8 b0, u8 w) {
 
 static void
 audio_talk(Device *d, u8 b0, u8 w) {
-        AudioChannel *c = &channels[0];
+        AudioChannel *c = &channels[d - devaudio];
         if(!w) {
                 if(b0 == 0x2) {
                         mempoke16(d->dat, 0x2, c->pos);
@@ -123,12 +123,14 @@ audio_talk(Device *d, u8 b0, u8 w) {
                         // d->dat[0x4] = apu_get_vu(c);
         }
         } else if(b0 == 0xf) {
+        u16 length = mempeek16(d->dat, 0xa);
+
             // Disable the channel before updating.
                 c->data = NULL;
 
         // Data.
         c->pos = 0;
-                c->length = mempeek16(d->dat, 0xa);
+                c->length = length;
                 c->length <<= 12; // fixed point.
                 c->data = &d->mem[mempeek16(d->dat, 0xc)];
 
@@ -148,7 +150,11 @@ audio_talk(Device *d, u8 b0, u8 w) {
                 c->pitch = d->dat[0xf] & 0x7f;
 
                 // Initialization.
-        c->inc = pitch_table_44100[c->pitch];
+                if (length > 256) {
+            c->inc = pitch_table_44100[c->pitch];
+                } else {
+            c->inc = pitch_table_variable[c->pitch] * length / AUDIO_FREQ;
+        }
 
             txt_position(0, 0);
         txt_printf("note: %d     \n", c->pitch);