empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Study Box: Fixed issues with 96kHz sample rate

Browse source 
Also fixed sound playing too slow/fast if changing sample rate during playback
This commit is contained in:
Sour 2020-01-01 18:47:55 -05:00
parent 18f87ffcc6
commit 67c8cb4433
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Core/StudyBox.h
View file

@ -320,6 +320,7 @@ public:
{
if(!_motorDisabled && _wavReader) {
_wavReader->ApplySamples(buffer, sampleCount, _audioEnabled ? volume : 0);
_wavReader->SetSampleRate(_console->GetSettings()->GetSampleRate());
}
}
};

12
Utilities/WavReader.cpp
View file

@ -71,7 +71,11 @@ bool WavReader::IsPlaybackOver()
void WavReader::SetSampleRate(uint32_t sampleRate)
{
_sampleRate = sampleRate;
if(_sampleRate != sampleRate) {
_sampleRate = sampleRate;
blip_clear(_blip);
blip_set_rates(_blip, _fileSampleRate, _sampleRate);
}
}
void WavReader::LoadSamples(uint32_t samplesToLoad)
@ -106,7 +110,11 @@ void WavReader::ApplySamples(int16_t *buffer, size_t sampleCount, double volume)
//Volume is set to 10 when volume is set to 100% in the UI
volume /= 10.0;
LoadSamples((uint32_t)sampleCount * _fileSampleRate / _sampleRate + 1 - blip_samples_avail(_blip));
int32_t samplesToLoad = (int32_t)sampleCount * _fileSampleRate / _sampleRate + 1 - blip_samples_avail(_blip);
if(samplesToLoad > 0) {
LoadSamples(samplesToLoad);
}
int samplesRead = blip_read_samples(_blip, _outputBuffer, (int)sampleCount, 0);
for(size_t i = 0, len = samplesRead; i < len; i++) {

1
Utilities/WavReader.h
View file

@ -22,7 +22,6 @@ private:
uint32_t _sampleRate;
void LoadSamples(uint32_t samplesToLoad);
int16_t ReadSample();
WavReader();