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

openal: Always use release_sound_data

Browse Source 
This simplifies cleanup() a little bit.
This commit is contained in:
Sam Edwards 2018-03-02 00:53:10 -07:00
parent 9a5d7d8254
commit a10cd7d8bb
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
panda/src/audiotraits/openalAudioSound.I
View File

@ -55,10 +55,17 @@ require_sound_data() {
/** /**
* Checks if the sound data record is present and releasable, and if so, * Checks if the sound data record is present and releasable, and if so,
* releases it. * releases it.
*
* The sound data is "releasable" if it's from an ordinary, local file. Remote
* streams cannot necessarily be reopened if lost, so we'll hold onto them if
* so. The `force` argument overrides this, indicating we don't intend to
* reacquire the sound data.
*/ */
void OpenALAudioSound:: void OpenALAudioSound::
release_sound_data() { release_sound_data(bool force) {
if ((_sd!=0) && (!_movie->get_filename().empty())) { if (!has_sound_data()) return;
if (force || !_movie->get_filename().empty()) {
_manager->decrement_client_count(_sd); _manager->decrement_client_count(_sd);
_sd = 0; _sd = 0;
} }

7
panda/src/audiotraits/openalAudioSound.cxx
View File

@ -80,7 +80,7 @@ OpenALAudioSound(OpenALAudioManager* manager,
audio_warning("stereo sound " << movie->get_filename() << " will not be spatialized"); audio_warning("stereo sound " << movie->get_filename() << " will not be spatialized");
} }
} }
release_sound_data(); release_sound_data(false);
} }
@ -106,8 +106,7 @@ cleanup() {
stop(); stop();
} }
if (has_sound_data()) { if (has_sound_data()) {
_manager->decrement_client_count(_sd); release_sound_data(true);
_sd = 0;
} }
_manager->release_sound(this); _manager->release_sound(this);
_manager = 0; _manager = 0;
@ -219,7 +218,7 @@ stop() {
} }
_manager->stopping_sound(this); _manager->stopping_sound(this);
release_sound_data(); release_sound_data(false);
} }
/** /**

2
panda/src/audiotraits/openalAudioSound.h
View File

@ -117,7 +117,7 @@ private:
void pull_used_buffers(); void pull_used_buffers();
void push_fresh_buffers(); void push_fresh_buffers();
INLINE bool require_sound_data(); INLINE bool require_sound_data();
INLINE void release_sound_data(); INLINE void release_sound_data(bool force);
INLINE bool is_valid() const; INLINE bool is_valid() const;
INLINE bool is_playing() const; INLINE bool is_playing() const;