zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-02-20 19:02:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

revise error logging in sdl2 audio driver

Browse source
This commit is contained in:
derselbst 2019-03-17 17:56:06 +01:00
parent 5b2b5e6659
commit 598ec01ce1
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/drivers/fluid_sdl2.c
View file

@ -72,7 +72,7 @@ void fluid_sdl2_audio_driver_settings(fluid_settings_t *settings)
if(dev_name != NULL) if(dev_name != NULL)
{ {
FLUID_LOG(FLUID_DBG, "Testing audio device: %s", dev_name); FLUID_LOG(FLUID_DBG, "SDL2 driver testing audio device: %s", dev_name);
fluid_settings_add_option(settings, "audio.sdl2.device", dev_name); fluid_settings_add_option(settings, "audio.sdl2.device", dev_name);
} }
} }
@ -93,6 +93,13 @@ new_fluid_sdl2_audio_driver(fluid_settings_t *settings, fluid_synth_t *synth)
char *device; char *device;
const char *dev_name; const char *dev_name;
/* Check if SDL library has been started */
if(!SDL_WasInit(SDL_INIT_AUDIO))
{
FLUID_LOG(FLUID_ERR, "Failed to create SDL2 audio driver, because the audio subsystem of SDL2 is not initialized.");
return NULL;
}
/* Retrieve the settings */ /* Retrieve the settings */
fluid_settings_getnum(settings, "synth.sample-rate", &sample_rate); fluid_settings_getnum(settings, "synth.sample-rate", &sample_rate);
fluid_settings_getint(settings, "audio.period-size", &period_size); fluid_settings_getint(settings, "audio.period-size", &period_size);
@ -103,14 +110,14 @@ new_fluid_sdl2_audio_driver(fluid_settings_t *settings, fluid_synth_t *synth)
period_size = 1024; period_size = 1024;
} }
else else
{
/* According to documentation, it MUST be a power of two */ /* According to documentation, it MUST be a power of two */
if((period_size & (period_size - 1)) != 0) if((period_size & (period_size - 1)) != 0)
{ {
FLUID_LOG(FLUID_DBG, "\"audio.period-size\" must be a power of 2"); FLUID_LOG(FLUID_ERR, "\"audio.period-size\" must be a power of 2 for SDL2");
return NULL; return NULL;
} }
}
/* Clear the format buffer */ /* Clear the format buffer */
FLUID_MEMSET(&aspec, 0, sizeof(aspec)); FLUID_MEMSET(&aspec, 0, sizeof(aspec));
@ -147,13 +154,6 @@ new_fluid_sdl2_audio_driver(fluid_settings_t *settings, fluid_synth_t *synth)
aspec.samples = aspec.channels * ((period_size + 7) & ~7); aspec.samples = aspec.channels * ((period_size + 7) & ~7);
aspec.callback = (SDL_AudioCallback)SDLAudioCallback; aspec.callback = (SDL_AudioCallback)SDLAudioCallback;
/* Check if SDL library has been started */
if(!SDL_WasInit(SDL_INIT_AUDIO))
{
FLUID_LOG(FLUID_ERR, "SDL2 not initialized");
return NULL;
}
/* Set default device to use */ /* Set default device to use */
device = NULL; device = NULL;
dev_name = NULL; dev_name = NULL;