X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Fcode940%2F940shared.h;h=6f12a32f08527855923f6fdb6e11fd45bfb2410f;hb=27f190ea0097fa6a6f51bfacfd38a984d797e59b;hp=89531962d59691eb48c38227a57f2abfd5be6164;hpb=abe0ea43b561e2def84cf921b1d6d8c82819ea69;p=picodrive.git

diff --git a/platform/gp2x/code940/940shared.h b/platform/gp2x/code940/940shared.h
index 8953196..6f12a32 100644
--- a/platform/gp2x/code940/940shared.h
+++ b/platform/gp2x/code940/940shared.h
@@ -1,7 +1,6 @@
-#include "../../../Pico/sound/ym2612.h"
-#include "../helix/pub/mp3dec.h"
+#include "../../../pico/sound/ym2612.h"
 
-// max 16 jobs
+// max 16 jobs, lower num means higher prio
 enum _940_job_t {
 	JOB940_INITALL = 1,
 	JOB940_INVALIDATE_DCACHE,
@@ -9,6 +8,10 @@ enum _940_job_t {
 	JOB940_YM2612UPDATEONE,
 	JOB940_MP3DECODE,
 	JOB940_PICOSTATELOAD,
+	JOB940_PICOSTATESAVE2,
+	JOB940_PICOSTATELOAD2_PREP,
+	JOB940_PICOSTATELOAD2,
+	JOB940_MP3RESET,
 };
 
 //#define MAX_940JOBS	2
@@ -16,7 +19,7 @@ enum _940_job_t {
 typedef struct
 {
 	YM2612  ym2612;				/* current state of the emulated YM2612 */
-	HMP3Decoder mp3dec;			/* mp3 decoder's handle */
+	void	*mp3dec;			/* mp3 decoder's handle */
 	int     ym_buffer[44100/50*2];		/* this is where the YM2612 samples will be mixed to */
 	short   mp3_buffer[2][1152*2];		/* buffers for mp3 decoder's output */
 } _940_data_t;
@@ -35,6 +38,7 @@ typedef struct
 	int		writebuffsel;			/* which write buffer to use (from 940 side) */
 	UINT16  writebuff0[2048];			/* list of writes to ym2612, 1024 for savestates, 1024 extra */
 	UINT16  writebuff1[2048];
+	int		ym_active_chs;
 	int		mp3_len;			/* data len of loaded mp3 */
 	int		mp3_offs;			/* current playback offset (just after last decoded frame) */
 	int		mp3_buffsel;			/* which output buffer to decode to */