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

patch from Cort to use get_null_sound()

Browse Source
This commit is contained in:
David Rose 2003-03-11 19:34:03 +00:00
parent e12722220f
commit a18ed01a3e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/audiotraits/fmodAudioManager.cxx
View File

@ -142,7 +142,7 @@ get_sound(const string &file_name) {
if(!is_valid()) { if(!is_valid()) {
audio_debug("invalid FmodAudioManager returning NullSound"); audio_debug("invalid FmodAudioManager returning NullSound");
return new NullAudioSound(); return get_null_sound();
} }
assert(is_valid()); assert(is_valid());
@ -170,7 +170,7 @@ get_sound(const string &file_name) {
new_entry.data = load(path, new_entry.size); new_entry.data = load(path, new_entry.size);
if (!new_entry.data) { if (!new_entry.data) {
audio_error("FmodAudioManager::load failed."); audio_error("FmodAudioManager::load failed.");
return 0; return get_null_sound();
} }
new_entry.refcount = 0; new_entry.refcount = 0;
new_entry.stale = true; new_entry.stale = true;
@ -211,7 +211,7 @@ get_sound(const string &file_name) {
} }
if (stream == NULL) { if (stream == NULL) {
audio_error("FmodAudioManager::get_sound failed."); audio_error("FmodAudioManager::get_sound failed.");
return 0; return get_null_sound();
} }
inc_refcount(path); inc_refcount(path);
most_recently_used(path); most_recently_used(path);