ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix MSU-1 audio file read loop

This commit is contained in:
qwertymodo 2016-11-03 14:56:46 -07:00
parent f1d07c7572
commit 0e6b86d00e
2 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
apu/apu.cpp
View File

@ -338,17 +338,8 @@ bool8 S9xMixSamples (uint8 *buffer, int sample_count)
{
uint8 *msu_sample = new uint8[sample_count * 2];
msu::resampler->read((short *)msu_sample, sample_count);
for (uint32 i = 0; i < sample_count * 2; i += 2)
{
int16 s1, s2;
((uint8 *)&s1)[0] = dest[i];
((uint8 *)&s1)[1] = dest[i + 1];
((uint8 *)&s2)[0] = msu_sample[i];
((uint8 *)&s2)[1] = msu_sample[i + 1];
s1 += s2;
dest[i] = ((uint8 *)&s1)[0];
dest[i+1] = ((uint8 *)&s1)[1];
}
for (uint32 i = 0; i < sample_count; ++i)
*((int16*)(dest+(i * 2))) += *((int16*)(msu_sample+(i * 2)));
}
}
}
@ -401,9 +392,16 @@ void S9xFinalizeSamples (void)
return;
}
if (Settings.MSU1 && !msu::resampler->push((short *) msu::landing_buffer, S9xMSU1Samples()))
if (Settings.MSU1)
{
S9xMSU1Execute();
if (!msu::resampler->push((short *)msu::landing_buffer, S9xMSU1Samples()))
{
spc::sound_in_sync = FALSE;
if (Settings.SoundSync && !Settings.TurboMode)
return;
}
}
}
@ -489,8 +487,7 @@ bool8 S9xInitSound (int buffer_ms, int lag_ms)
spc::buffer_size <<= 1;
if (Settings.SixteenBitSound)
spc::buffer_size <<= 1;
if (Settings.MSU1)
msu::buffer_size = (buffer_ms * 44100 / 1000) << 2; // 16-bit, Stereo
msu::buffer_size = (buffer_ms * 44100 / 1000) << 2; // Always 16-bit, Stereo
printf("Sound buffer size: %d (%d samples)\n", spc::buffer_size, sample_count);
@ -653,8 +650,6 @@ void S9xAPUEndScanline (void)
S9xAPUExecute();
SNES::dsp.synchronize();
S9xMSU1Execute();
if (SNES::dsp.spc_dsp.sample_count() >= APU_MINIMUM_SAMPLE_BLOCK || !spc::sound_in_sync)
S9xLandSamples();
}

32
msu1.cpp
View File

@ -233,25 +233,10 @@ void S9xMSU1Init(void)
void S9xMSU1Execute(void)
{
static long long hitcount = 0;
//return; // Dummy out for now because it's broken
while ((bufPos < bufEnd) && (MSU1.MSU1_STATUS & AudioPlaying))
while (((uintptr_t)bufPos < (uintptr_t)bufEnd) && (MSU1.MSU1_STATUS & AudioPlaying))
{
hitcount++;
if (audioFile.good())
if (audioFile.is_open())
{
audioPos += 2;
int16 sample = 0;
((uint8 *)&sample)[0] = audioFile.get();
((uint8 *)&sample)[1] = audioFile.get();
sample = (double)sample * (double)MSU1.MSU1_VOLUME / 255.0;
*bufPos = ((uint8 *)&sample)[0];
*(bufPos + 1) = ((uint8 *)&sample)[1];
bufPos += 2;
if (audioFile.eof())
{
if (MSU1.MSU1_STATUS & AudioRepeating)
@ -266,10 +251,21 @@ void S9xMSU1Execute(void)
return;
}
}
int16 sample = 0;
audioFile.get(((char *)&sample), 2);
sample = (double)sample * (double)MSU1.MSU1_VOLUME / 255.0;
*(bufPos++) = sample;
audioPos += 2;
}
else
{
MSU1.MSU1_STATUS &= ~AudioPlaying;
MSU1.MSU1_STATUS &= ~(AudioPlaying | AudioRepeating);
audioFile.seekg(8);
return;
}
}
}