unsigned int prevflags:3; // flags from previous block\r
unsigned int bIgnoreLoop:1; // Ignore loop\r
unsigned int bNewPitch:1; // pitch changed\r
- int iLeftVolume; // left volume\r
- int iRightVolume; // right volume\r
+ unsigned int bStarting:1; // starting after keyon\r
+ union {\r
+ struct {\r
+ int iLeftVolume; // left volume\r
+ int iRightVolume; // right volume\r
+ };\r
+ int iVolume[2];\r
+ };\r
ADSRInfoEx ADSRX;\r
int iRawPitch; // raw pitch (0...3fff)\r
} SPUCHAN;\r
unsigned char * pSpuIrq;\r
\r
unsigned int cycles_played;\r
+ unsigned int cycles_dma_end;\r
int decode_pos;\r
int decode_dirty_ch;\r
unsigned int bSpuInit:1;\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
int * SB;\r
int * SSumLR;\r
\r
- int pad[29];\r
unsigned short regArea[0x400];\r
} SPUInfo;\r
\r
void schedule_next_irq(void);\r
void check_irq_io(unsigned int addr);\r
\r
-#define do_samples_if_needed(c, sync) \\r
+#define do_samples_if_needed(c, sync, samples) \\r
do { \\r
- if (sync || (int)((c) - spu.cycles_played) >= 16 * 768) \\r
+ if (sync || (int)((c) - spu.cycles_played) >= (samples) * 768) \\r
do_samples(c, sync); \\r
} while (0)\r
\r