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

more debugging

Browse Source
This commit is contained in:
Cary Sandvig 2001-03-20 23:18:07 +00:00
parent fb6ab65c75
commit 51d9d1a928
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/audio/audio_manager.cxx
View File

@ -85,6 +85,9 @@ AudioManager* AudioManager::get_ptr(void) {
// Description: get the player off the sound, and start it playing // Description: get the player off the sound, and start it playing
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void AudioManager::ns_play(AudioSound* sound, float start_time) { void AudioManager::ns_play(AudioSound* sound, float start_time) {
if (audio_cat->is_debug())
audio_cat->debug() << "AudioManager: playing sound 0x" << (void*)sound
<< endl;
if (sound->status() == AudioSound::PLAYING) if (sound->status() == AudioSound::PLAYING)
this->ns_stop(sound); this->ns_stop(sound);
sound->get_player()->play_sound(sound->get_sound(), sound->get_state(), sound->get_player()->play_sound(sound->get_sound(), sound->get_state(),
@ -97,6 +100,9 @@ void AudioManager::ns_play(AudioSound* sound, float start_time) {
// Description: get the player off the sound, and stop it playing // Description: get the player off the sound, and stop it playing
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void AudioManager::ns_stop(AudioSound* sound) { void AudioManager::ns_stop(AudioSound* sound) {
if (audio_cat->is_debug())
audio_cat->debug() << "AudioManager: stopping sound 0x" << (void*)sound
<< endl;
this->ns_set_loop(sound, false); this->ns_set_loop(sound, false);
if (sound->status() == AudioSound::PLAYING) if (sound->status() == AudioSound::PLAYING)
sound->get_player()->stop_sound(sound->get_sound(), sound->get_state()); sound->get_player()->stop_sound(sound->get_sound(), sound->get_state());
@ -113,7 +119,7 @@ void AudioManager::ns_set_loop(AudioSound* sound, bool state) {
_loopset = new LoopSet; _loopset = new LoopSet;
if (state) if (state)
_loopset->insert(sound); _loopset->insert(sound);
else else if (_loopset->find(sound) != _loopset->end())
_loopset->erase(sound); _loopset->erase(sound);
} }

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

@ -112,16 +112,14 @@ AudioSound* AudioPool::ns_load_sound(Filename filename) {
// Description: The nonstatic implementation of release_sound(). // Description: The nonstatic implementation of release_sound().
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void AudioPool::ns_release_sound(AudioSound* sound) { void AudioPool::ns_release_sound(AudioSound* sound) {
if (audio_cat->is_debug())
audio_cat->debug() << "AudioPool: releasing sound 0x" << (void*)sound
<< endl;
string filename = sound->get_name(); string filename = sound->get_name();
SoundMap::iterator si; SoundMap::iterator si;
si = _sounds.find(filename); si = _sounds.find(filename);
if (si != _sounds.end() && (*si).second == sound->get_sound()) { if (si != _sounds.end() && (*si).second == sound->get_sound())
// REFCOUNT
// don't do this with refcounting
// AudioTraits::SoundClass* sc = (*si).second;
// (*(sc->get_destroy()))(sc);
_sounds.erase(si); _sounds.erase(si);
}
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -130,12 +128,8 @@ void AudioPool::ns_release_sound(AudioSound* sound) {
// Description: The nonstatic implementation of release_all_sounds(). // Description: The nonstatic implementation of release_all_sounds().
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void AudioPool::ns_release_all_sounds(void) { void AudioPool::ns_release_all_sounds(void) {
// REFCOUNT if (audio_cat->is_debug())
// for (SoundMap::iterator i=_sounds.begin(); i!=_sounds.end(); ++i) { audio_cat->debug() << "AudioPool: releasing all sounds" << endl;
// don't do this with refcounting
// AudioTraits::SoundClass* sc = (*i).second;
// (*(sc->get_destroy()))(sc);
// }
_sounds.clear(); _sounds.clear();
} }