unsigned int bFMod:2; // freq mod (0=off, 1=sound channel, 2=freq channel)\r
unsigned int prevflags:3; // flags from previous block\r
unsigned int bIgnoreLoop:1; // Ignore loop\r
- unsigned int bNewPitch:1; // pitch changed\r
unsigned int bStarting:1; // starting after keyon\r
union {\r
struct {\r
\r
// psx buffers / addresses\r
\r
-#define SB_SIZE (32 + 4)\r
+typedef union\r
+{\r
+ int SB[28 + 4 + 4];\r
+ struct {\r
+ int sample[28];\r
+ union {\r
+ struct {\r
+ int pos;\r
+ signed short val[4];\r
+ } gauss;\r
+ int simple[5]; // 28-32\r
+ } interp;\r
+ int sinc_old;\r
+ };\r
+} sample_buf;\r
\r
typedef struct\r
{\r
void (CALLBACK *cddavCallback)(short, short);\r
void (CALLBACK *scheduleCallback)(unsigned int);\r
\r
- xa_decode_t * xapGlobal;\r
+ const xa_decode_t * xapGlobal;\r
unsigned int * XAFeed;\r
unsigned int * XAPlay;\r
unsigned int * XAStart;\r
REVERBInfo * rvb;\r
\r
// buffers\r
- int * SB;\r
+ void * unused;\r
int * SSumLR;\r
\r
unsigned short regArea[0x400];\r
+\r
+ sample_buf sb[MAXCHAN];\r
+ int interpolation;\r
+ sample_buf sb_thread[MAXCHAN];\r
} SPUInfo;\r
\r
#define regAreaGet(offset) \\r