\r
///////////////////////////////////////////////////////////\r
\r
-// Tmp Flags\r
-\r
-// used for debug channel muting\r
-#define FLAG_MUTE 1\r
-\r
-// used for simple interpolation\r
-#define FLAG_IPOL0 2\r
-#define FLAG_IPOL1 4\r
-\r
-///////////////////////////////////////////////////////////\r
-\r
// MAIN CHANNEL STRUCT\r
typedef struct\r
{\r
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
+ int 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
unsigned short spuStat;\r
\r
unsigned int spuAddr;\r
- union {\r
- unsigned char *spuMemC;\r
- unsigned short *spuMem;\r
- };\r
- unsigned char * pSpuIrq;\r
\r
unsigned int cycles_played;\r
unsigned int cycles_dma_end;\r
unsigned int dwChannelsAudible; // not silent channels\r
unsigned int dwChannelDead; // silent+not useful channels\r
\r
+ unsigned int XARepeat;\r
+ unsigned int XALastVal;\r
+\r
+ int iLeftXAVol;\r
+ int iRightXAVol;\r
+\r
+ struct { // channel volume in the cd controller\r
+ unsigned char ll, lr, rl, rr; // see cdr.Attenuator* in cdrom.c\r
+ } cdv; // applied on spu side for easier emulation\r
+\r
+ unsigned int last_keyon_cycles;\r
+\r
+ union {\r
+ unsigned char *spuMemC;\r
+ unsigned short *spuMem;\r
+ };\r
+ unsigned char * pSpuIrq;\r
+\r
unsigned char * pSpuBuffer;\r
short * pS;\r
\r
- void (CALLBACK *irqCallback)(void); // func of main emu, called on spu irq\r
- void (CALLBACK *cddavCallback)(short, short);\r
+ SPUCHAN * s_chan;\r
+ REVERBInfo * rvb;\r
+\r
+ int * SSumLR;\r
+\r
+ void (CALLBACK *irqCallback)(int);\r
+ //void (CALLBACK *cddavCallback)(short, short);\r
void (CALLBACK *scheduleCallback)(unsigned int);\r
\r
const xa_decode_t * xapGlobal;\r
unsigned int * CDDAStart;\r
unsigned int * CDDAEnd;\r
\r
- unsigned int XARepeat;\r
- unsigned int XALastVal;\r
-\r
- int iLeftXAVol;\r
- int iRightXAVol;\r
-\r
- SPUCHAN * s_chan;\r
- REVERBInfo * rvb;\r
-\r
- // buffers\r
- int * SB;\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
void do_samples(unsigned int cycles_to, int do_sync);\r
void schedule_next_irq(void);\r
void check_irq_io(unsigned int addr);\r
+void do_irq_io(int cycles_after);\r
\r
#define do_samples_if_needed(c, sync, samples) \\r
do { \\r
\r
#endif\r
\r
+void FeedXA(const xa_decode_t *xap);\r
+void FeedCDDA(unsigned char *pcm, int nBytes);\r
+\r
#endif /* __P_SOUND_EXTERNALS_H__ */\r