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

add get_null_sound()

Browse Source
This commit is contained in:
David Rose 2003-02-28 19:45:54 +00:00
parent 86ac9e99e0
commit f32b59b92d
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
panda/src/audio/audioManager.cxx
View File

@ -83,9 +83,23 @@ create_AudioManager() {
return am; return am;
} }
////////////////////////////////////////////////////////////////////
// Function: AudioManager::get_null_sound
// Access: Public
// Description: Returns a special NullAudioSound object that has all
// the interface of a normal sound object, but plays no
// sound. This same object may also be returned by
// get_sound() if it fails.
////////////////////////////////////////////////////////////////////
PT(AudioSound) AudioManager::
get_null_sound() {
if (_null_sound == (AudioSound *)NULL) {
_null_sound = new NullAudioSound;
}
return _null_sound;
}
void AudioManager:: void AudioManager::
set_mutually_exclusive(bool bExclusive) { set_mutually_exclusive(bool bExclusive) {
_bExclusive = bExclusive; _bExclusive = bExclusive;
} }

2
panda/src/audio/audioManager.h
View File

@ -42,6 +42,7 @@ PUBLISHED:
// Get a sound: // Get a sound:
virtual PT(AudioSound) get_sound(const string& file_name) = 0; virtual PT(AudioSound) get_sound(const string& file_name) = 0;
PT(AudioSound) get_null_sound();
// Tell the AudioManager there is no need to keep this one cached. // Tell the AudioManager there is no need to keep this one cached.
// This doesn't break any connection between AudioSounds that have // This doesn't break any connection between AudioSounds that have
@ -83,6 +84,7 @@ public:
protected: protected:
static Create_AudioManager_proc* _create_AudioManager; static Create_AudioManager_proc* _create_AudioManager;
bool _bExclusive; bool _bExclusive;
PT(AudioSound) _null_sound;
AudioManager() { AudioManager() {
// intentionally blank. // intentionally blank.

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

@ -265,7 +265,7 @@ get_sound(const string& file_name) {
if(!is_valid()) { if(!is_valid()) {
audio_debug("invalid MilesAudioManager returning NullSound"); audio_debug("invalid MilesAudioManager returning NullSound");
return new NullAudioSound(); return get_null_sound();
} }
assert(is_valid()); assert(is_valid());
@ -303,7 +303,7 @@ get_sound(const string& file_name) {
// The insert failed. // The insert failed.
audio_debug(" failed map insert of "<<path); audio_debug(" failed map insert of "<<path);
assert(is_valid()); assert(is_valid());
return 0; return get_null_sound();
} }
// Set si, so that we can get a reference to the path // Set si, so that we can get a reference to the path
// for the MilesAudioSound. // for the MilesAudioSound.