Update jni/Android.mk

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

diff --git a/platform/gp2x/code940/940shared.h b/platform/gp2x/code940/940shared.h
index a55020b..6f12a32 100644 (file)
--- a/platform/gp2x/code940/940shared.h
+++ b/platform/gp2x/code940/940shared.h
@@ -1,7 +1,6 @@
-#include "../../../Pico/sound/ym2612.h"\r
-#include "../../common/helix/pub/mp3dec.h"\r
+#include "../../../pico/sound/ym2612.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 +8,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
@@ -16,7 +19,7 @@ enum _940_job_t {
 typedef struct\r
 {\r
        YM2612  ym2612;                         /* current state of the emulated YM2612 */\r
-       HMP3Decoder mp3dec;                     /* mp3 decoder's handle */\r
+       void    *mp3dec;                        /* mp3 decoder's handle */\r
        int     ym_buffer[44100/50*2];          /* this is where the YM2612 samples will be mixed to */\r
        short   mp3_buffer[2][1152*2];          /* buffers for mp3 decoder's output */\r
 } _940_data_t;\r