Fix broken client if openal cannot be opened (#9804)

This commit is contained in:
Loïc Blot 2020-05-05 08:38:18 +02:00 committed by GitHub
parent cad5b987ad
commit f1a05d0f71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 12 deletions

@ -1249,7 +1249,7 @@ bool Game::init(
bool Game::initSound() bool Game::initSound()
{ {
#if USE_SOUND #if USE_SOUND
if (g_settings->getBool("enable_sound")) { if (g_settings->getBool("enable_sound") && g_sound_manager_singleton.get()) {
infostream << "Attempting to use OpenAL audio" << std::endl; infostream << "Attempting to use OpenAL audio" << std::endl;
sound = createOpenALSoundManager(g_sound_manager_singleton.get(), &soundfetcher); sound = createOpenALSoundManager(g_sound_manager_singleton.get(), &soundfetcher);
if (!sound) if (!sound)

@ -275,25 +275,38 @@ public:
m_device(nullptr, delete_alcdevice), m_device(nullptr, delete_alcdevice),
m_context(nullptr, delete_alccontext) m_context(nullptr, delete_alccontext)
{ {
if (!(m_device = unique_ptr_alcdevice(alcOpenDevice(nullptr), delete_alcdevice))) }
throw std::runtime_error("Audio: Global Initialization: Device Open");
bool init()
{
if (!(m_device = unique_ptr_alcdevice(alcOpenDevice(nullptr), delete_alcdevice))) {
errorstream << "Audio: Global Initialization: Failed to open device" << std::endl;
return false;
}
if (!(m_context = unique_ptr_alccontext( if (!(m_context = unique_ptr_alccontext(
alcCreateContext(m_device.get(), nullptr), delete_alccontext))) { alcCreateContext(m_device.get(), nullptr), delete_alccontext))) {
throw std::runtime_error("Audio: Global Initialization: Context Create"); errorstream << "Audio: Global Initialization: Failed to create context" << std::endl;
return false;
} }
if (!alcMakeContextCurrent(m_context.get())) if (!alcMakeContextCurrent(m_context.get())) {
throw std::runtime_error("Audio: Global Initialization: Context Current"); errorstream << "Audio: Global Initialization: Failed to make current context" << std::endl;
return false;
}
alDistanceModel(AL_INVERSE_DISTANCE_CLAMPED); alDistanceModel(AL_INVERSE_DISTANCE_CLAMPED);
if (alGetError() != AL_NO_ERROR) if (alGetError() != AL_NO_ERROR) {
throw std::runtime_error("Audio: Global Initialization: OpenAL Error"); errorstream << "Audio: Global Initialization: OpenAL Error " << alGetError() << std::endl;
return false;
}
infostream << "Audio: Global Initialized: OpenAL " << alGetString(AL_VERSION) infostream << "Audio: Global Initialized: OpenAL " << alGetString(AL_VERSION)
<< ", using " << alcGetString(m_device.get(), ALC_DEVICE_SPECIFIER) << ", using " << alcGetString(m_device.get(), ALC_DEVICE_SPECIFIER)
<< std::endl; << std::endl;
return true;
} }
~SoundManagerSingleton() ~SoundManagerSingleton()
@ -682,7 +695,11 @@ public:
std::shared_ptr<SoundManagerSingleton> createSoundManagerSingleton() std::shared_ptr<SoundManagerSingleton> createSoundManagerSingleton()
{ {
return std::shared_ptr<SoundManagerSingleton>(new SoundManagerSingleton()); auto smg = std::make_shared<SoundManagerSingleton>();
if (!smg->init()) {
smg.reset();
}
return smg;
} }
ISoundManager *createOpenALSoundManager(SoundManagerSingleton *smg, OnDemandSoundFetcher *fetcher) ISoundManager *createOpenALSoundManager(SoundManagerSingleton *smg, OnDemandSoundFetcher *fetcher)

@ -144,10 +144,10 @@ GUIEngine::GUIEngine(JoystickController *joystick,
//create soundmanager //create soundmanager
MenuMusicFetcher soundfetcher; MenuMusicFetcher soundfetcher;
#if USE_SOUND #if USE_SOUND
if (g_settings->getBool("enable_sound")) if (g_settings->getBool("enable_sound") && g_sound_manager_singleton.get())
m_sound_manager = createOpenALSoundManager(g_sound_manager_singleton.get(), &soundfetcher); m_sound_manager = createOpenALSoundManager(g_sound_manager_singleton.get(), &soundfetcher);
#endif #endif
if(!m_sound_manager) if (!m_sound_manager)
m_sound_manager = &dummySoundManager; m_sound_manager = &dummySoundManager;
//create topleft header //create topleft header