notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #20 from AkimanBengus/master
[picodrive.git]
/
platform
/
gp2x
/
code940
/
940shared.h
diff --git
a/platform/gp2x/code940/940shared.h
b/platform/gp2x/code940/940shared.h
index
8953196
..
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 "../helix/pub/mp3dec.h"
\r
+#include "../../../pico/sound/ym2612.h"
\r
\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
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_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
};
\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
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
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
@@
-35,6
+38,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 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
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