static int PsndBuffer[2*44100/50];\r
\r
// dac\r
-static unsigned short dac_info[312]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample\r
+static unsigned short dac_info[312+4]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample\r
\r
// cdda output buffer\r
short cdda_out_buffer[2*1152];\r
int PsndLen=0; // number of mono samples, multiply by 2 for stereo\r
int PsndLen_exc_add=0; // this is for non-integer sample counts per line, eg. 22050/60\r
int PsndLen_exc_cnt=0;\r
+int PsndDacLine=0;\r
short *PsndOut=NULL; // PCM data buffer\r
\r
+// timers\r
+int timer_a_next_oflow, timer_a_step, timer_a_offset; // in z80 cycles\r
+int timer_b_next_oflow, timer_b_step, timer_b_offset;\r
+\r
// sn76496\r
extern int *sn76496_regs;\r
\r
{\r
int i, dac_cnt, pos, len, lines = Pico.m.pal ? 312 : 262, mid = Pico.m.pal ? 68 : 93;\r
\r
- if(PsndLen <= lines) {\r
+ if (PsndLen <= lines)\r
+ {\r
// shrinking algo\r
dac_cnt = -PsndLen;\r
len=1; pos=0;\r
dac_info[225] = 1;\r
\r
- for(i=226; i != 225; i++) {\r
+ for(i=226; i != 225; i++)\r
+ {\r
if (i >= lines) i = 0;\r
len = 0;\r
if(dac_cnt < 0) {\r
dac_cnt -= PsndLen;\r
dac_info[i] = (pos<<4)|len;\r
}\r
- } else {\r
+ }\r
+ else\r
+ {\r
// stretching\r
dac_cnt = PsndLen;\r
pos=0;\r
- for(i = 225; i != 224; i++) {\r
+ for(i = 225; i != 224; i++)\r
+ {\r
if (i >= lines) i = 0;\r
len=0;\r
while(dac_cnt >= 0) {\r
if (PsndLen_exc_add) len++;\r
dac_info[224] = (pos<<4)|len;\r
}\r
+ for (i = lines; i < sizeof(dac_info) / sizeof(dac_info[0]); i++)\r
+ dac_info[i] = 0;\r
//for(i=len=0; i < lines; i++) {\r
// printf("%03i : %03i : %i\n", i, dac_info[i]>>4, dac_info[i]&0xf);\r
// len+=dac_info[i]&0xf;\r
// also clear the internal registers+addr line\r
ym2612_regs = YM2612GetRegs();\r
memset(ym2612_regs, 0, 0x200+4);\r
- z80startCycle = z80stopCycle = 0;\r
+ timers_reset();\r
\r
PsndRerate(0);\r
}\r
}\r
\r
\r
-// This is called once per raster (aka line), but not necessarily for every line\r
-PICO_INTERNAL void Psnd_timers_and_dac(int raster)\r
+PICO_INTERNAL void PsndDoDAC(int line_to)\r
{\r
- int pos, len;\r
- int do_dac = PsndOut && (PicoOpt&POPT_EN_FM) && *ym2612_dacen;\r
-// int do_pcm = PsndOut && (PicoAHW&1) && (PicoOpt&0x400);\r
-\r
- // Our raster lasts 63.61323/64.102564 microseconds (NTSC/PAL)\r
- YM2612PicoTick(1);\r
+ int pos, pos1, len;\r
+ int dout = ym2612.dacout;\r
+ int line_from = PsndDacLine;\r
\r
- if (!do_dac /*&& !do_pcm*/) return;\r
+ PsndDacLine = line_to + 1;\r
\r
- pos=dac_info[raster], len=pos&0xf;\r
+ pos =dac_info[line_from]>>4;\r
+ pos1=dac_info[line_to];\r
+ len = ((pos1>>4)-pos) + (pos1&0xf);\r
if (!len) return;\r
\r
- pos>>=4;\r
-\r
- if (do_dac)\r
- {\r
+ if (PicoOpt & POPT_EN_STEREO) {\r
short *d = PsndOut + pos*2;\r
- int dout = *ym2612_dacout;\r
- if(PicoOpt&POPT_EN_STEREO) {\r
- // some manual loop unrolling here :)\r
- d[0] = dout;\r
- if (len > 1) {\r
- d[2] = dout;\r
- if (len > 2)\r
- d[4] = dout;\r
- }\r
- } else {\r
- short *d = PsndOut + pos;\r
- d[0] = dout;\r
- if (len > 1) {\r
- d[1] = dout;\r
- if (len > 2)\r
- d[2] = dout;\r
- }\r
- }\r
+ for (; len > 0; len--, d+=2) *d = dout;\r
+ } else {\r
+ short *d = PsndOut + pos;\r
+ for (; len > 0; len--, d++) *d = dout;\r
}\r
\r
#if 0\r