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

Add Dummy AudioDriver into the AudioDriverManager list

This commit is contained in:
Marcelo Fernandez 2018-08-13 18:11:24 -03:00
parent c4e75aa63a
commit 14fa843735
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
servers/audio_server.cpp
View File

@ -143,14 +143,19 @@ AudioDriver::AudioDriver() {
#endif #endif
} }
AudioDriver *AudioDriverManager::drivers[MAX_DRIVERS];
int AudioDriverManager::driver_count = 0;
AudioDriverDummy AudioDriverManager::dummy_driver; AudioDriverDummy AudioDriverManager::dummy_driver;
AudioDriver *AudioDriverManager::drivers[MAX_DRIVERS] = {
&AudioDriverManager::dummy_driver,
};
int AudioDriverManager::driver_count = 1;
void AudioDriverManager::add_driver(AudioDriver *p_driver) { void AudioDriverManager::add_driver(AudioDriver *p_driver) {
ERR_FAIL_COND(driver_count >= MAX_DRIVERS); ERR_FAIL_COND(driver_count >= MAX_DRIVERS);
drivers[driver_count++] = p_driver; drivers[driver_count - 1] = p_driver;
// Last driver is always our dummy driver
drivers[driver_count++] = &AudioDriverManager::dummy_driver;
} }
int AudioDriverManager::get_driver_count() { int AudioDriverManager::get_driver_count() {
@ -183,14 +188,6 @@ void AudioDriverManager::initialize(int p_driver) {
return; return;
} }
} }
// Fallback to our dummy driver
if (dummy_driver.init() == OK) {
ERR_PRINT("AudioDriverManager: all drivers failed, falling back to dummy driver");
dummy_driver.set_singleton();
} else {
ERR_PRINT("AudioDriverManager: dummy driver failed to init()");
}
} }
AudioDriver *AudioDriverManager::get_driver(int p_driver) { AudioDriver *AudioDriverManager::get_driver(int p_driver) {