TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-19 13:15:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

protect against assertion

Browse Source
This commit is contained in:
David Rose 2006-10-03 01:07:41 +00:00
parent ef26d66a3c
commit b9a108f9cd
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
panda/src/audiotraits/milesAudioManager.cxx
View File

@ -104,21 +104,25 @@ MilesAudioManager() {
// Load the downloadable sounds file: // Load the downloadable sounds file:
if (_dls_field == NULL) { if (_dls_field == NULL) {
HDLSDEVICE dls; HDLSDEVICE dls = NULL;
AIL_quick_handles(0, 0, &dls); AIL_quick_handles(0, 0, &dls);
nassertv(dls != NULL); if (dls == NULL) {
string dls_file = Filename(audio_dls_file).to_os_specific(); audio_error(" Unable to open DLS. " << AIL_last_error());
if (dls_file.empty()) { } else {
get_gm_file_path(dls_file); string dls_file = Filename(audio_dls_file).to_os_specific();
// we need more dbg info in logs, so bumping the msgs from 'debug' status to 'info' status if (dls_file.empty()) {
audio_info(" using default dls_file: "<< dls_file ); get_gm_file_path(dls_file);
// we need more dbg info in logs, so bumping the msgs from 'debug' status to 'info' status
audio_info(" using default dls_file: "<< dls_file );
}
audio_debug(" dls_file=\""<<dls_file<<"\"");
// note: if AIL_DLS_load_file is not done, midi fails to play on some machines.
nassertv(_dls_field == NULL);
audio_debug(" AIL_DLS_load_file(dls, " << dls_file << ", 0)");
_dls_field = AIL_DLS_load_file(dls, dls_file.c_str(), 0);
} }
audio_debug(" dls_file=\""<<dls_file<<"\"");
// note: if AIL_DLS_load_file is not done, midi fails to play on some machines.
nassertv(_dls_field == NULL);
audio_debug(" AIL_DLS_load_file(dls, " << dls_file << ", 0)");
_dls_field = AIL_DLS_load_file(dls, dls_file.c_str(), 0);
if (!_dls_field) { if (!_dls_field) {
audio_error(" AIL_DLS_load_file() failed, \""<<AIL_last_error() <<"\" Switching to hardware midi"); audio_error(" AIL_DLS_load_file() failed, \""<<AIL_last_error() <<"\" Switching to hardware midi");
AIL_quick_shutdown(); AIL_quick_shutdown();