seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when no audio driver is available

Browse Source
This commit is contained in:
Marcelo Fernandez
2017-09-13 13:34:22 -03:00
committed by marcelofg55
parent d6b392825f
commit 7a4c0ff35e
13 changed files with 53 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
platform/x11/os_x11.cpp
View File

@ -313,29 +313,7 @@ void OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_au
XFree(xsh);
}
AudioDriverManager::get_driver(p_audio_driver)->set_singleton();
audio_driver_index = p_audio_driver;
if (AudioDriverManager::get_driver(p_audio_driver)->init() != OK) {
bool success = false;
audio_driver_index = -1;
for (int i = 0; i < AudioDriverManager::get_driver_count(); i++) {
if (i == p_audio_driver)
continue;
AudioDriverManager::get_driver(i)->set_singleton();
if (AudioDriverManager::get_driver(i)->init() == OK) {
success = true;
print_line("Audio Driver Failed: " + String(AudioDriverManager::get_driver(p_audio_driver)->get_name()));
print_line("Using alternate audio driver: " + String(AudioDriverManager::get_driver(i)->get_name()));
audio_driver_index = i;
break;
}
}
if (!success) {
ERR_PRINT("Initializing audio failed.");
}
}
AudioDriverManager::initialize(p_audio_driver);
ERR_FAIL_COND(!visual_server);
ERR_FAIL_COND(x11_window == 0);
@ -2189,10 +2167,6 @@ bool OS_X11::is_disable_crash_handler() const {
OS_X11::OS_X11() {
#ifdef RTAUDIO_ENABLED
AudioDriverManager::add_driver(&driver_rtaudio);
#endif
#ifdef PULSEAUDIO_ENABLED
AudioDriverManager::add_driver(&driver_pulseaudio);
#endif
@ -2201,11 +2175,6 @@ OS_X11::OS_X11() {
AudioDriverManager::add_driver(&driver_alsa);
#endif
if (AudioDriverManager::get_driver_count() == 0) {
WARN_PRINT("No sound driver found... Defaulting to dummy driver");
AudioDriverManager::add_driver(&driver_dummy);
}
minimized = false;
xim_style = 0L;
mouse_mode = MOUSE_MODE_VISIBLE;