\r
PICO_INTERNAL void PsndReset(void)\r
{\r
- void *ym2612_regs;\r
-\r
- // also clear the internal registers+addr line\r
- ym2612_regs = YM2612GetRegs();\r
- memset(ym2612_regs, 0, 0x200+4);\r
- timers_reset();\r
-\r
+ // PsndRerate calls YM2612Init, which also resets\r
PsndRerate(0);\r
+ timers_reset();\r
}\r
\r
\r
lba_offset += Pico_mcd->TOC.Tracks[index].Offset;\r
\r
// find the actual file for this track\r
- for (i = index; i >= 0; i--)\r
+ for (i = index; i > 0; i--)\r
if (Pico_mcd->TOC.Tracks[i].F != NULL) break;\r
\r
if (Pico_mcd->TOC.Tracks[i].F == NULL) {\r
memset32((int *) PsndOut, 0, len); // assume PsndOut to be aligned\r
else {\r
short *out = PsndOut;\r
- if ((int)out & 2) { *out++ = 0; len--; }\r
+ if ((long)out & 2) { *out++ = 0; len--; }\r
memset32((int *) out, 0, len/2);\r
if (len & 1) out[len-1] = 0;\r
}\r
(Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled;\r
offset <<= stereo;\r
\r
+ pprof_start(sound);\r
+\r
#if !SIMPLE_WRITE_SOUND\r
if (offset == 0) { // should happen once per frame\r
// compensate for float part of PsndLen\r
cdda_raw_update(buf32, length);\r
}\r
\r
+ if ((PicoAHW & PAHW_32X) && (PicoOpt & POPT_EN_PWM))\r
+ p32x_pwm_update(buf32, length, stereo);\r
+\r
// convert + limit to normal 16bit output\r
PsndMix_32_to_16l(PsndOut+offset, buf32, length);\r
\r
+ pprof_end(sound);\r
+\r
return length;\r
}\r
\r