// struct defines\r
///////////////////////////////////////////////////////////\r
\r
+enum ADSR_State {\r
+ ADSR_ATTACK = 0,\r
+ ADSR_DECAY = 1,\r
+ ADSR_SUSTAIN = 2,\r
+ ADSR_RELEASE = 3,\r
+};\r
+\r
// ADSR INFOS PER CHANNEL\r
typedef struct\r
{\r
- unsigned char State:2;\r
+ unsigned char State:2; // ADSR_State\r
unsigned char AttackModeExp:1;\r
unsigned char SustainModeExp:1;\r
unsigned char SustainIncrease:1;\r
unsigned char * pCurr; // current pos in sound mem\r
unsigned char * pLoop; // loop ptr in sound mem\r
\r
- unsigned int bStop:1; // is channel stopped (sample _can_ still be playing, ADSR Release phase)\r
unsigned int bReverb:1; // can we do reverb on this channel? must have ctrl register bit, to get active\r
unsigned int bRVBActive:1; // reverb active flag\r
unsigned int bNoise:1; // noise active flag\r
int iRightVolume; // right volume\r
ADSRInfoEx ADSRX;\r
int iRawPitch; // raw pitch (0...3fff)\r
-\r
- int SB[32+4];\r
} SPUCHAN;\r
\r
///////////////////////////////////////////////////////////\r
int nFB_SRC_A0, nFB_SRC_A1, nFB_SRC_B0, nFB_SRC_B1;\r
} REVERBInfo;\r
\r
-///////////////////////////////////////////////////////////\r
-// SPU.C globals\r
///////////////////////////////////////////////////////////\r
\r
-#ifndef _IN_SPU\r
-\r
// psx buffers / addresses\r
\r
-extern unsigned short regArea[]; \r
-extern unsigned short spuMem[];\r
-extern unsigned char * spuMemC;\r
-extern unsigned char * pSpuIrq;\r
-extern unsigned char * pSpuBuffer;\r
-\r
-#define regAreaGet(ch,offset) \\r
- regArea[((ch<<4)|(offset))>>1]\r
+#define SB_SIZE (32 + 4)\r
\r
-// user settings\r
+typedef struct\r
+{\r
+ unsigned short spuCtrl;\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
+ int decode_pos;\r
+ int decode_dirty_ch;\r
+ unsigned int bSpuInit:1;\r
+ unsigned int bSPUIsOpen:1;\r
+\r
+ unsigned int dwNoiseVal; // global noise generator\r
+ unsigned int dwNoiseCount;\r
+ unsigned int dwNewChannel; // flags for faster testing, if new channel starts\r
+ unsigned int dwChannelOn; // not silent channels\r
+ unsigned int dwChannelDead; // silent+not useful channels\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)(unsigned short,unsigned short);\r
+ void (CALLBACK *scheduleCallback)(unsigned int);\r
+\r
+ xa_decode_t * xapGlobal;\r
+ unsigned int * XAFeed;\r
+ unsigned int * XAPlay;\r
+ unsigned int * XAStart;\r
+ unsigned int * XAEnd;\r
+\r
+ unsigned int * CDDAFeed;\r
+ unsigned int * CDDAPlay;\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
+ int * SB;\r
+\r
+ int * RVB;\r
+ int * SSumLR;\r
+\r
+ int pad[29];\r
+ unsigned short regArea[0x400];\r
+} SPUInfo;\r
\r
-extern int iVolume;\r
-extern int iXAPitch;\r
-extern int iUseReverb;\r
-extern int iUseInterpolation;\r
-// MISC\r
+///////////////////////////////////////////////////////////\r
+// SPU.C globals\r
+///////////////////////////////////////////////////////////\r
\r
-extern int decode_pos;\r
+#ifndef _IN_SPU\r
\r
-extern SPUCHAN s_chan[];\r
+extern SPUInfo spu;\r
extern REVERBInfo rvb;\r
\r
-extern unsigned short spuCtrl;\r
-extern unsigned short spuStat;\r
-extern unsigned short spuIrq;\r
-extern unsigned int spuAddr;\r
-extern int bSpuInit;\r
-extern unsigned int dwNewChannel;\r
-extern unsigned int dwChannelOn;\r
-extern unsigned int dwPendingChanOff;\r
-extern unsigned int dwChannelDead;\r
-\r
-extern int SSumR[];\r
-extern int SSumL[];\r
-extern short * pS;\r
-\r
-extern void (CALLBACK *cddavCallback)(unsigned short,unsigned short);\r
-\r
-extern unsigned int cycles_played;\r
-\r
-void do_samples(unsigned int cycles_to);\r
+void do_samples(unsigned int cycles_to, int do_sync);\r
void schedule_next_irq(void);\r
\r
-#define do_samples_if_needed(c) \\r
+#define regAreaGet(ch,offset) \\r
+ spu.regArea[((ch<<4)|(offset))>>1]\r
+\r
+#define do_samples_if_needed(c, sync) \\r
do { \\r
- if ((int)((c) - cycles_played) >= 16 * 768) \\r
- do_samples(c); \\r
+ if (sync || (int)((c) - spu.cycles_played) >= 16 * 768) \\r
+ do_samples(c, sync); \\r
} while (0)\r
\r
#endif\r
\r
-///////////////////////////////////////////////////////////\r
-// XA.C globals\r
-///////////////////////////////////////////////////////////\r
-\r
-#ifndef _IN_XA\r
-\r
-extern xa_decode_t * xapGlobal;\r
-\r
-extern uint32_t * XAFeed;\r
-extern uint32_t * XAPlay;\r
-extern uint32_t * XAStart;\r
-extern uint32_t * XAEnd;\r
-\r
-extern uint32_t * CDDAFeed;\r
-extern uint32_t * CDDAPlay;\r
-extern uint32_t * CDDAStart;\r
-extern uint32_t * CDDAEnd;\r
-\r
-extern int iLeftXAVol;\r
-extern int iRightXAVol;\r
-\r
-#endif\r
-\r
-///////////////////////////////////////////////////////////\r
-// REVERB.C globals\r
-///////////////////////////////////////////////////////////\r
-\r
-#ifndef _IN_REVERB\r
-\r
-extern int * sRVBPlay;\r
-extern int * sRVBEnd;\r
-extern int * sRVBStart;\r
-\r
-#endif\r
notaz.gp2x.de / pcsx_rearmed.git / blobdiff