bugfixes, new scaling, double ym upd at 940

[picodrive.git] / platform / gp2x / code940 / 940.c

diff --git a/platform/gp2x/code940/940.c b/platform/gp2x/code940/940.c
index c37c80e..4a1e718 100644 (file)
--- a/platform/gp2x/code940/940.c
+++ b/platform/gp2x/code940/940.c
@@ -55,6 +55,56 @@ static void mp3_decode(void)
        set_if_not_changed(&shared_ctl->mp3_offs, mp3_offs, readPtr - mp3_data);\r
 }\r
 \r
+static void ym_update(int *ym_buffer)\r
+{\r
+       int i, dw;\r
+       int two_upds = 0;\r
+       UINT16 *wbuff;\r
+\r
+       if (shared_ctl->writebuffsel == 1) {\r
+               wbuff = shared_ctl->writebuff1;\r
+       } else {\r
+               wbuff = shared_ctl->writebuff0;\r
+       }\r
+\r
+       /* playback all writes */\r
+       for (i = 2048/2; i > 0; i--) {\r
+               UINT16 d;\r
+               dw = *(int *)wbuff;\r
+               d = dw;\r
+               wbuff++;\r
+               if (d == 0xffff) break;\r
+               if (d == 0xfffe) { two_upds=1; break; }\r
+               YM2612Write_(d >> 8, d);\r
+               d = (dw>>16);\r
+               wbuff++;\r
+               if (d == 0xffff) break;\r
+               if (d == 0xfffe) { two_upds=1; break; }\r
+               YM2612Write_(d >> 8, d);\r
+       }\r
+\r
+       if (two_upds) {\r
+               int len1 = shared_ctl->length / 2;\r
+               shared_ctl->ym_active_chs =\r
+                       YM2612UpdateOne_(ym_buffer, len1, shared_ctl->stereo, 1);\r
+\r
+               for (i *= 2; i > 0; i--) {\r
+                       UINT16 d = *wbuff++;\r
+                       if (d == 0xffff) break;\r
+                       YM2612Write_(d >> 8, d);\r
+               }\r
+\r
+               ym_buffer += shared_ctl->stereo ? len1*2 : len1;\r
+               len1 = shared_ctl->length - len1;\r
+\r
+               shared_ctl->ym_active_chs =\r
+                       YM2612UpdateOne_(ym_buffer, len1, shared_ctl->stereo, 1);\r
+       } else {\r
+               shared_ctl->ym_active_chs =\r
+                       YM2612UpdateOne_(ym_buffer, shared_ctl->length, shared_ctl->stereo, 1);\r
+       }\r
+}\r
+\r
 \r
 void Main940(void)\r
 {\r
@@ -92,30 +142,9 @@ void Main940(void)
                                YM2612PicoStateLoad_();\r
                                break;\r
 \r
-                       case JOB940_YM2612UPDATEONE: {\r
-                               int i, dw, *wbuff;\r
-                               if (shared_ctl->writebuffsel == 1) {\r
-                                       wbuff = (int *) shared_ctl->writebuff1;\r
-                               } else {\r
-                                       wbuff = (int *) shared_ctl->writebuff0;\r
-                               }\r
-\r
-                               /* playback all writes */\r
-                               for (i = 2048/2; i > 0; i--) {\r
-                                       UINT16 d;\r
-                                       dw = *wbuff++;\r
-                                       d = dw;\r
-                                       if (d == 0xffff) break;\r
-                                       YM2612Write_(d >> 8, d);\r
-                                       d = (dw>>16);\r
-                                       if (d == 0xffff) break;\r
-                                       YM2612Write_(d >> 8, d);\r
-                               }\r
-\r
-                               shared_ctl->ym_active_chs =\r
-                                       YM2612UpdateOne_(ym_buffer, shared_ctl->length, shared_ctl->stereo, 1);\r
+                       case JOB940_YM2612UPDATEONE:\r
+                               ym_update(ym_buffer);\r
                                break;\r
-                       }\r
 \r
                        case JOB940_MP3DECODE:\r
                                mp3_decode();\r