#include "../cd/cue.h"\r
#include "mix.h"\r
\r
-#define SIMPLE_WRITE_SOUND 0\r
-\r
void (*PsndMix_32_to_16l)(short *dest, int *src, int count) = mix_32_to_16l_stereo;\r
\r
// master int buffer to mix to\r
static int PsndBuffer[2*(44100+100)/50];\r
\r
-// dac\r
-static unsigned short dac_info[312+4]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample\r
+// dac, psg\r
+static unsigned short dac_info[312+4]; // pos in sample buffer\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
+int PsndDacLine, PsndPsgLine;\r
short *PsndOut=NULL; // PCM data buffer\r
+static int PsndLen_use;\r
\r
// timers\r
int timer_a_next_oflow, timer_a_step; // in z80 cycles\r
\r
static void dac_recalculate(void)\r
{\r
- int i, dac_cnt, pos, len, lines = Pico.m.pal ? 312 : 262, mid = Pico.m.pal ? 68 : 93;\r
+ int i, dac_cnt, pos, len, lines = Pico.m.pal ? 313 : 262, mid = Pico.m.pal ? 68 : 93;\r
\r
if (PsndLen <= lines)\r
{\r
for(i=226; i != 225; i++)\r
{\r
if (i >= lines) i = 0;\r
- len = 0;\r
if(dac_cnt < 0) {\r
- len=1;\r
pos++;\r
dac_cnt += lines;\r
}\r
dac_cnt -= PsndLen;\r
- dac_info[i] = (pos<<4)|len;\r
+ dac_info[i] = pos;\r
}\r
}\r
else\r
len++;\r
}\r
dac_cnt += PsndLen;\r
- dac_info[i] = (pos<<4)|len;\r
- pos+=len;\r
+ pos += len;\r
+ dac_info[i] = pos;\r
}\r
- // last sample\r
- for(len = 0, i = pos; i < PsndLen; i++) len++;\r
- if (PsndLen_exc_add) len++;\r
- dac_info[224] = (pos<<4)|len;\r
}\r
- mid = (dac_info[lines-1] & 0xfff0) + ((dac_info[lines-1] & 0xf) << 4);\r
for (i = lines; i < sizeof(dac_info) / sizeof(dac_info[0]); i++)\r
- dac_info[i] = mid;\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
- //}\r
- //printf("rate is %i, len %f\n", PsndRate, (double)PsndRate/(Pico.m.pal ? 50.0 : 60.0));\r
- //printf("len total: %i, last pos: %i\n", len, pos);\r
- //exit(8);\r
+ dac_info[i] = dac_info[0];\r
}\r
\r
\r
PsndClear();\r
\r
// set mixer\r
- PsndMix_32_to_16l = (PicoOpt & POPT_EN_STEREO) ? mix_32_to_16l_stereo : mix_32_to_16_mono;\r
+ PsndMix_32_to_16l = (PicoIn.opt & POPT_EN_STEREO) ? mix_32_to_16l_stereo : mix_32_to_16_mono;\r
\r
- if (PicoAHW & PAHW_PICO)\r
+ if (PicoIn.AHW & PAHW_PICO)\r
PicoReratePico();\r
}\r
\r
\r
+PICO_INTERNAL void PsndStartFrame(void)\r
+{\r
+ // compensate for float part of PsndLen\r
+ PsndLen_use = PsndLen;\r
+ PsndLen_exc_cnt += PsndLen_exc_add;\r
+ if (PsndLen_exc_cnt >= 0x10000) {\r
+ PsndLen_exc_cnt -= 0x10000;\r
+ PsndLen_use++;\r
+ }\r
+\r
+ PsndDacLine = PsndPsgLine = 0;\r
+ Pico.m.status &= ~1;\r
+ dac_info[224] = PsndLen_use;\r
+}\r
+\r
PICO_INTERNAL void PsndDoDAC(int line_to)\r
{\r
int pos, pos1, len;\r
int dout = ym2612.dacout;\r
int line_from = PsndDacLine;\r
\r
- if (line_to >= 312)\r
- line_to = 311;\r
+ if (line_to >= 313)\r
+ line_to = 312;\r
+\r
+ pos = dac_info[line_from];\r
+ pos1 = dac_info[line_to + 1];\r
+ len = pos1 - pos;\r
+ if (len <= 0)\r
+ return;\r
\r
PsndDacLine = line_to + 1;\r
\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
+ if (!PsndOut)\r
+ return;\r
\r
- if (PicoOpt & POPT_EN_STEREO) {\r
+ if (PicoIn.opt & POPT_EN_STEREO) {\r
short *d = PsndOut + pos*2;\r
- for (; len > 0; len--, d+=2) *d = dout;\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
+ for (; len > 0; len--, d++) *d += dout;\r
+ }\r
+}\r
+\r
+PICO_INTERNAL void PsndDoPSG(int line_to)\r
+{\r
+ int line_from = PsndPsgLine;\r
+ int pos, pos1, len;\r
+ int stereo = 0;\r
+\r
+ if (line_to >= 313)\r
+ line_to = 312;\r
+\r
+ pos = dac_info[line_from];\r
+ pos1 = dac_info[line_to + 1];\r
+ len = pos1 - pos;\r
+ //elprintf(EL_STATUS, "%3d %3d %3d %3d %3d",\r
+ // pos, pos1, len, line_from, line_to);\r
+ if (len <= 0)\r
+ return;\r
+\r
+ PsndPsgLine = line_to + 1;\r
+\r
+ if (!PsndOut || !(PicoIn.opt & POPT_EN_PSG))\r
+ return;\r
+\r
+ if (PicoIn.opt & POPT_EN_STEREO) {\r
+ stereo = 1;\r
+ pos <<= 1;\r
}\r
+ SN76496Update(PsndOut + pos, len, stereo);\r
}\r
\r
// cdda\r
{\r
int len = PsndLen;\r
if (PsndLen_exc_add) len++;\r
- if (PicoOpt & POPT_EN_STEREO)\r
+ if (PicoIn.opt & POPT_EN_STEREO)\r
memset32((int *) PsndOut, 0, len); // assume PsndOut to be aligned\r
else {\r
short *out = PsndOut;\r
{\r
int buf32_updated = 0;\r
int *buf32 = PsndBuffer+offset;\r
- int stereo = (PicoOpt & 8) >> 3;\r
+ int stereo = (PicoIn.opt & 8) >> 3;\r
\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
- PsndLen_exc_cnt += PsndLen_exc_add;\r
- if (PsndLen_exc_cnt >= 0x10000) {\r
- PsndLen_exc_cnt -= 0x10000;\r
- length++;\r
- }\r
- }\r
-#endif\r
-\r
- // PSG\r
- if (PicoOpt & POPT_EN_PSG)\r
- SN76496Update(PsndOut+offset, length, stereo);\r
-\r
- if (PicoAHW & PAHW_PICO) {\r
+ if (PicoIn.AHW & PAHW_PICO) {\r
PicoPicoPCMUpdate(PsndOut+offset, length, stereo);\r
return length;\r
}\r
\r
// Add in the stereo FM buffer\r
- if (PicoOpt & POPT_EN_FM) {\r
+ if (PicoIn.opt & POPT_EN_FM) {\r
buf32_updated = YM2612UpdateOne(buf32, length, stereo, 1);\r
} else\r
memset32(buf32, 0, length<<stereo);\r
(void)buf32_updated;\r
\r
// CD: PCM sound\r
- if (PicoAHW & PAHW_MCD) {\r
+ if (PicoIn.AHW & PAHW_MCD) {\r
pcd_pcm_update(buf32, length, stereo);\r
//buf32_updated = 1;\r
}\r
\r
// CD: CDDA audio\r
// CD mode, cdda enabled, not data track, CDC is reading\r
- if ((PicoAHW & PAHW_MCD) && (PicoOpt & POPT_EN_MCD_CDDA)\r
+ if ((PicoIn.AHW & PAHW_MCD) && (PicoIn.opt & POPT_EN_MCD_CDDA)\r
&& Pico_mcd->cdda_stream != NULL\r
&& !(Pico_mcd->s68k_regs[0x36] & 1))\r
{\r
cdda_raw_update(buf32, length);\r
}\r
\r
- if ((PicoAHW & PAHW_32X) && (PicoOpt & POPT_EN_PWM))\r
+ if ((PicoIn.AHW & PAHW_32X) && (PicoIn.opt & POPT_EN_PWM))\r
p32x_pwm_update(buf32, length, stereo);\r
\r
// convert + limit to normal 16bit output\r
// to be called on 224 or line_sample scanlines only\r
PICO_INTERNAL void PsndGetSamples(int y)\r
{\r
-#if SIMPLE_WRITE_SOUND\r
- if (y != 224) return;\r
- PsndRender(0, PsndLen);\r
- if (PicoWriteSound)\r
- PicoWriteSound(PsndLen * ((PicoOpt & POPT_EN_STEREO) ? 4 : 2));\r
- PsndClear();\r
-#else\r
static int curr_pos = 0;\r
\r
+ if (ym2612.dacen && PsndDacLine < y)\r
+ PsndDoDAC(y - 1);\r
+ PsndDoPSG(y - 1);\r
+\r
if (y == 224)\r
{\r
- if (emustatus & 2)\r
+ if (Pico.m.status & 2)\r
curr_pos += PsndRender(curr_pos, PsndLen-PsndLen/2);\r
- else curr_pos = PsndRender(0, PsndLen);\r
- if (emustatus & 1)\r
- emustatus |= 2;\r
- else emustatus &= ~2;\r
+ else curr_pos = PsndRender(0, PsndLen_use);\r
+ if (Pico.m.status & 1)\r
+ Pico.m.status |= 2;\r
+ else Pico.m.status &= ~2;\r
if (PicoWriteSound)\r
- PicoWriteSound(curr_pos * ((PicoOpt & POPT_EN_STEREO) ? 4 : 2));\r
+ PicoWriteSound(curr_pos * ((PicoIn.opt & POPT_EN_STEREO) ? 4 : 2));\r
// clear sound buffer\r
PsndClear();\r
+ PsndDacLine = 224;\r
+ dac_info[224] = 0;\r
}\r
- else if (emustatus & 3) {\r
- emustatus|= 2;\r
- emustatus&=~1;\r
+ else if (Pico.m.status & 3) {\r
+ Pico.m.status |= 2;\r
+ Pico.m.status &= ~1;\r
curr_pos = PsndRender(0, PsndLen/2);\r
}\r
-#endif\r
}\r
\r
PICO_INTERNAL void PsndGetSamplesMS(void)\r
{\r
- int stereo = (PicoOpt & 8) >> 3;\r
- int length = PsndLen;\r
-\r
-#if !SIMPLE_WRITE_SOUND\r
- // compensate for float part of PsndLen\r
- PsndLen_exc_cnt += PsndLen_exc_add;\r
- if (PsndLen_exc_cnt >= 0x10000) {\r
- PsndLen_exc_cnt -= 0x10000;\r
- length++;\r
- }\r
-#endif\r
+ int stereo = (PicoIn.opt & 8) >> 3;\r
+ int length = PsndLen_use;\r
\r
// PSG\r
- if (PicoOpt & POPT_EN_PSG)\r
+ if (PicoIn.opt & POPT_EN_PSG)\r
SN76496Update(PsndOut, length, stereo);\r
\r
// upmix to "stereo" if needed\r
}\r
\r
if (PicoWriteSound != NULL)\r
- PicoWriteSound(length * ((PicoOpt & POPT_EN_STEREO) ? 4 : 2));\r
+ PicoWriteSound(length * ((PicoIn.opt & POPT_EN_STEREO) ? 4 : 2));\r
PsndClear();\r
}\r
\r
+// vim:shiftwidth=2:ts=2:expandtab\r
notaz.gp2x.de / picodrive.git / blobdiff