unify helix mp3 code, some sound adjustments

[picodrive.git] / platform / gp2x / code940 / 940shared.h

diff --git a/platform/gp2x/code940/940shared.h b/platform/gp2x/code940/940shared.h
index 8953196..5797260 100644 (file)
--- a/platform/gp2x/code940/940shared.h
+++ b/platform/gp2x/code940/940shared.h
@@ -1,7 +1,7 @@
-#include "../../../Pico/sound/ym2612.h"\r
-#include "../helix/pub/mp3dec.h"\r
+#include "../../../pico/sound/ym2612.h"\r
+#include "../../common/helix/pub/mp3dec.h"\r
 \r
-// max 16 jobs\r
+// max 16 jobs, lower num means higher prio\r
 enum _940_job_t {\r
        JOB940_INITALL = 1,\r
        JOB940_INVALIDATE_DCACHE,\r
@@ -9,6 +9,10 @@ enum _940_job_t {
        JOB940_YM2612UPDATEONE,\r
        JOB940_MP3DECODE,\r
        JOB940_PICOSTATELOAD,\r
+       JOB940_PICOSTATESAVE2,\r
+       JOB940_PICOSTATELOAD2_PREP,\r
+       JOB940_PICOSTATELOAD2,\r
+       JOB940_MP3RESET,\r
 };\r
 \r
 //#define MAX_940JOBS  2\r
@@ -35,6 +39,7 @@ typedef struct
        int             writebuffsel;                   /* which write buffer to use (from 940 side) */\r
        UINT16  writebuff0[2048];                       /* list of writes to ym2612, 1024 for savestates, 1024 extra */\r
        UINT16  writebuff1[2048];\r
+       int             ym_active_chs;\r
        int             mp3_len;                        /* data len of loaded mp3 */\r
        int             mp3_offs;                       /* current playback offset (just after last decoded frame) */\r
        int             mp3_buffsel;                    /* which output buffer to decode to */\r