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

Added logic to Qt GUI to protect against invalid audio sample rates or buffer sizes being fed from the command line to the sound system. Sound will use default values if inputs are deemed invalid. Fixes issue #603

This commit is contained in:
harry 2023-01-11 21:38:29 -05:00
parent cc1e6a8f8b
commit 37bf5c9bf2
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/drivers/Qt/sdl-sound.cpp
View File

@ -49,6 +49,7 @@ static double noiseGateRate = 0.010;
static bool noiseGateActive = true; static bool noiseGateActive = true;
static bool windowSoundMute = false; static bool windowSoundMute = false;
static bool fillInit = 1; static bool fillInit = 1;
static const unsigned int supportedSampleRates[] = { 11025, 22050, 44100, 48000, 96000, 0 };
static bool s_mute = false; static bool s_mute = false;
@ -186,11 +187,12 @@ fillaudio(void *udata,
int int
InitSound() InitSound()
{ {
int sound, soundrate, soundbufsize, soundvolume, soundtrianglevolume, soundsquare1volume, soundsquare2volume, soundnoisevolume, soundpcmvolume, soundq; int i, sound, soundrate, soundbufsize, soundvolume, soundtrianglevolume, soundsquare1volume, soundsquare2volume, soundnoisevolume, soundpcmvolume, soundq;
SDL_AudioSpec spec; SDL_AudioSpec spec;
const char *driverName; const char *driverName;
int frmRateSampleAdj = 0; int frmRateSampleAdj = 0;
int samplesPerFrame; int samplesPerFrame;
bool sampleRateIsSupported = false;
g_config->getOption("SDL.Sound", &sound); g_config->getOption("SDL.Sound", &sound);
if (!sound) if (!sound)
@ -218,6 +220,31 @@ InitSound()
g_config->getOption("SDL.Sound.NoiseVolume", &soundnoisevolume); g_config->getOption("SDL.Sound.NoiseVolume", &soundnoisevolume);
g_config->getOption("SDL.Sound.PCMVolume", &soundpcmvolume); g_config->getOption("SDL.Sound.PCMVolume", &soundpcmvolume);
i = 0;
while (supportedSampleRates[i] != 0)
{
if (soundrate == supportedSampleRates[i])
{
sampleRateIsSupported = true;
break;
}
i++;
}
if (!sampleRateIsSupported)
{
printf("Error: Audio Sample Rate %i is either invalid or not supported, reverting to default of 44100\n", soundrate);
soundrate = 44100;
g_config->setOption("SDL.Sound.Rate", soundrate);
}
if ( (soundbufsize < 15) || (soundbufsize > 200) )
{
printf("Error: Audio Buffer Size of %i ms is invalid, reverting to default of 128\n", soundbufsize);
soundbufsize = 128;
g_config->setOption("SDL.Sound.BufSize", soundbufsize);
}
spec.freq = s_SampleRate = soundrate; spec.freq = s_SampleRate = soundrate;
spec.format = AUDIO_S16SYS; spec.format = AUDIO_S16SYS;
spec.channels = 1; spec.channels = 1;