FM+AY working!

tsfm_speccy_player/player.asm

@@ -50,14 +50,14 @@ player_channels:
         channel_struct_t    0, music_p0_ch5
         channel_struct_t    0, music_p0_ch6
         channel_struct_t    0, music_p0_ch7
-        channel_struct_t    0, music_p0_ch8
-        channel_struct_t    0, music_p0_ch9
+        channel_struct_t    1, music_p0_ch8
+        channel_struct_t    1, music_p0_ch9
         channel_struct_t    0, music_p0_ch10
-        channel_struct_t    0, music_p0_ch11
-        channel_struct_t    0, music_p0_ch12
-        channel_struct_t    0, music_p0_ch13
-        channel_struct_t    0, music_p0_ch14
-        channel_struct_t    0, music_p0_ch15
+        channel_struct_t    3, music_p0_ch11
+        channel_struct_t    1, music_p0_ch12
+        channel_struct_t    3, music_p0_ch13
+        channel_struct_t    3, music_p0_ch14
+        channel_struct_t    3, music_p0_ch15
 
 player_struct  player_struct_t  player_channels+(channel_struct_t*(3+0)+channel_struct_t.reg_extch3_fhi), player_channels+(channel_struct_t*(3+8)+channel_struct_t.reg_extch3_fhi)
         
@@ -759,6 +759,7 @@ play_tick:
         ; chip_index = 0;
         xor     a : ld [player_struct.chip_idx], a
 
+    if 1
         ; opmplay_parse_stream(ctx, ctx->channels +  0, 0, opmplay_parse_fm_control_stream);
         ld      ix, player_channels + (channel_struct_t * 0)
         ld      bc, parse_fm_control_stream
@@ -781,8 +782,9 @@ play_tick:
         ld      bc, parse_fm_channel_stream
         ld      a, 2 : ld [player_struct.channel_idx], a
         call    parse_stream
+    endif
 
-    if 0
+    if 1
         ; opmplay_parse_stream(ctx, ctx->channels +  4, 0, opmplay_parse_ay_channel_stream);
         ld      ix, player_channels + (channel_struct_t * 4)
         ld      bc, parse_ay_channel_stream
@@ -817,6 +819,7 @@ play_tick:
         ; chip_index = 1;
         ld      a, 1 : ld [player_struct.chip_idx], a
 
+    if 1
         ; opmplay_parse_stream(ctx, ctx->channels +  0, 0, opmplay_parse_fm_control_stream);
         ld      ix, player_channels + (channel_struct_t * 8)
         ld      bc, parse_fm_control_stream
@@ -839,8 +842,9 @@ play_tick:
         ld      bc, parse_fm_channel_stream
         ld      a, 2 : ld [player_struct.channel_idx], a
         call    parse_stream
+    endif
 
-    if 0
+    if 1
         ; opmplay_parse_stream(ctx, ctx->channels +  4, 0, opmplay_parse_ay_channel_stream);
         ld      ix, player_channels + (channel_struct_t * 12)
         ld      bc, parse_ay_channel_stream

tsfm_speccy_player/tsfm_1308_0451_optimized/music.inc

@@ -0,0 +1,9 @@
+    ; autogenerated, edit with care!
+    ifndef MUSIC_INC
+    define MUSIC_INC
+
+TICK_RATE            equ 50
+TOTAL_FRAMES         equ 3840
+TOTAL_CHANNELS       equ 16
+FILEPATH             equ "tsfm_1308_0451_optimized/tsfm_1308_0451_optimized"
+    endif

tsfm_speccy_player/tsfm_1308_0451_optimized/tsfm_1308_0451_optimized_ch0.bin

@@ -0,0 +1 @@
+<EFBFBD>0<EFBFBD>@<40>C3<43>p2<70>L,<2C><>C2<43><32>0p+<2B><>L+N<>C$<24><><p*<2A><>L,<2C><>C2<43><32><p+<2B>L+N<>C3<43>p2<70>L,<2C><>C2<43><32>0p3<70><33>L4*<2A>C4<43><34><p4<70><34>H<><48>B<EFBFBD><42>xp:<3A><>C3<43>p2<70>L,<2C><>C2<43><32>0p+<2B><>L+N<>C$<24><><p*<2A><>L,<2C><>C2<43><32><p+<2B>L+N<>C3<43>p2<70>L,<2C><>C2<43><32>0p3<70><33>L4*<2A>C4<43>p4<70><34>