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

audio: get_sound and uncache_sound should take Filename, not string

Browse Source
This commit is contained in:
rdb 2018-09-02 20:55:58 +02:00
parent 845ec7a990
commit 17bf50f1e8
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,7 @@ PUBLISHED:
virtual bool is_valid() = 0; virtual bool is_valid() = 0;
// Get a sound: // Get a sound:
virtual PT(AudioSound) get_sound(const std::string& file_name, bool positional = false, int mode=SM_heuristic) = 0; virtual PT(AudioSound) get_sound(const Filename &file_name, bool positional = false, int mode=SM_heuristic) = 0;
virtual PT(AudioSound) get_sound(MovieAudio *source, bool positional = false, int mode=SM_heuristic) = 0; virtual PT(AudioSound) get_sound(MovieAudio *source, bool positional = false, int mode=SM_heuristic) = 0;
PT(AudioSound) get_null_sound(); PT(AudioSound) get_null_sound();
@ -95,7 +95,7 @@ PUBLISHED:
// doesn't break any connection between AudioSounds that have already given // doesn't break any connection between AudioSounds that have already given
// by get_sound() from this manager. It's only affecting whether the // by get_sound() from this manager. It's only affecting whether the
// AudioManager keeps a copy of the sound in its poolcache. // AudioManager keeps a copy of the sound in its poolcache.
virtual void uncache_sound(const std::string& file_name) = 0; virtual void uncache_sound(const Filename &file_name) = 0;
virtual void clear_cache() = 0; virtual void clear_cache() = 0;
virtual void set_cache_limit(unsigned int count) = 0; virtual void set_cache_limit(unsigned int count) = 0;
virtual unsigned int get_cache_limit() const = 0; virtual unsigned int get_cache_limit() const = 0;

4
panda/src/audio/nullAudioManager.cxx
View File

@ -49,7 +49,7 @@ is_valid() {
* *
*/ */
PT(AudioSound) NullAudioManager:: PT(AudioSound) NullAudioManager::
get_sound(const std::string&, bool positional, int mode) { get_sound(const Filename &, bool positional, int mode) {
return get_null_sound(); return get_null_sound();
} }
@ -65,7 +65,7 @@ get_sound(MovieAudio *sound, bool positional, int mode) {
* *
*/ */
void NullAudioManager:: void NullAudioManager::
uncache_sound(const std::string&) { uncache_sound(const Filename &) {
// intentionally blank. // intentionally blank.
} }

4
panda/src/audio/nullAudioManager.h
View File

@ -29,9 +29,9 @@ public:
virtual bool is_valid(); virtual bool is_valid();
virtual PT(AudioSound) get_sound(const std::string&, bool positional = false, int mode=SM_heuristic); virtual PT(AudioSound) get_sound(const Filename &, bool positional = false, int mode=SM_heuristic);
virtual PT(AudioSound) get_sound(MovieAudio *sound, bool positional = false, int mode=SM_heuristic); virtual PT(AudioSound) get_sound(MovieAudio *sound, bool positional = false, int mode=SM_heuristic);
virtual void uncache_sound(const std::string&); virtual void uncache_sound(const Filename &);
virtual void clear_cache(); virtual void clear_cache();
virtual void set_cache_limit(unsigned int); virtual void set_cache_limit(unsigned int);
virtual unsigned int get_cache_limit() const; virtual unsigned int get_cache_limit() const;

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

@ -409,7 +409,7 @@ configure_filters(FilterProperties *config) {
* This is what creates a sound instance. * This is what creates a sound instance.
*/ */
PT(AudioSound) FmodAudioManager:: PT(AudioSound) FmodAudioManager::
get_sound(const std::string &file_name, bool positional, int) { get_sound(const Filename &file_name, bool positional, int) {
ReMutexHolder holder(_lock); ReMutexHolder holder(_lock);
// Needed so People use Panda's Generic UNIX Style Paths for Filename. // Needed so People use Panda's Generic UNIX Style Paths for Filename.
// path.to_os_specific() converts it back to the proper OS version later on. // path.to_os_specific() converts it back to the proper OS version later on.
@ -772,7 +772,7 @@ reduce_sounds_playing_to(unsigned int count) {
* NOT USED FOR FMOD-EX!!! Clears a sound out of the sound cache. * NOT USED FOR FMOD-EX!!! Clears a sound out of the sound cache.
*/ */
void FmodAudioManager:: void FmodAudioManager::
uncache_sound(const std::string& file_name) { uncache_sound(const Filename &file_name) {
audio_debug("FmodAudioManager::uncache_sound(\""<<file_name<<"\")"); audio_debug("FmodAudioManager::uncache_sound(\""<<file_name<<"\")");
} }

4
panda/src/audiotraits/fmodAudioManager.h
View File

@ -88,7 +88,7 @@ public:
virtual bool is_valid(); virtual bool is_valid();
virtual PT(AudioSound) get_sound(const std::string&, bool positional = false, int mode=SM_heuristic); virtual PT(AudioSound) get_sound(const Filename &, bool positional = false, int mode=SM_heuristic);
virtual PT(AudioSound) get_sound(MovieAudio *, bool positional = false, int mode=SM_heuristic); virtual PT(AudioSound) get_sound(MovieAudio *, bool positional = false, int mode=SM_heuristic);
virtual int get_speaker_setup(); virtual int get_speaker_setup();
@ -146,7 +146,7 @@ public:
virtual void set_concurrent_sound_limit(unsigned int limit = 0); virtual void set_concurrent_sound_limit(unsigned int limit = 0);
virtual unsigned int get_concurrent_sound_limit() const; virtual unsigned int get_concurrent_sound_limit() const;
virtual void reduce_sounds_playing_to(unsigned int count); virtual void reduce_sounds_playing_to(unsigned int count);
virtual void uncache_sound(const std::string&); virtual void uncache_sound(const Filename &);
virtual void clear_cache(); virtual void clear_cache();
virtual void set_cache_limit(unsigned int count); virtual void set_cache_limit(unsigned int count);
virtual unsigned int get_cache_limit() const; virtual unsigned int get_cache_limit() const;

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

@ -122,7 +122,7 @@ is_valid() {
* *
*/ */
PT(AudioSound) MilesAudioManager:: PT(AudioSound) MilesAudioManager::
get_sound(const string &file_name, bool, int) { get_sound(const Filename &file_name, bool, int) {
LightReMutexHolder holder(_lock); LightReMutexHolder holder(_lock);
audio_debug("MilesAudioManager::get_sound(file_name=\""<<file_name<<"\")"); audio_debug("MilesAudioManager::get_sound(file_name=\""<<file_name<<"\")");
@ -218,7 +218,7 @@ get_sound(MovieAudio *sound, bool, int) {
* *
*/ */
void MilesAudioManager:: void MilesAudioManager::
uncache_sound(const string &file_name) { uncache_sound(const Filename &file_name) {
audio_debug("MilesAudioManager::uncache_sound(file_name=\"" audio_debug("MilesAudioManager::uncache_sound(file_name=\""
<<file_name<<"\")"); <<file_name<<"\")");
LightReMutexHolder holder(_lock); LightReMutexHolder holder(_lock);

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

@ -43,9 +43,9 @@ public:
virtual bool is_valid(); virtual bool is_valid();
virtual PT(AudioSound) get_sound(const std::string &file_name, bool positional = false, int mode=SM_heuristic); virtual PT(AudioSound) get_sound(const Filename &file_name, bool positional = false, int mode=SM_heuristic);
virtual PT(AudioSound) get_sound(MovieAudio *sound, bool positional = false, int mode=SM_heuristic); virtual PT(AudioSound) get_sound(MovieAudio *sound, bool positional = false, int mode=SM_heuristic);
virtual void uncache_sound(const std::string &file_name); virtual void uncache_sound(const Filename &file_name);
virtual void clear_cache(); virtual void clear_cache();
virtual void set_cache_limit(unsigned int count); virtual void set_cache_limit(unsigned int count);
virtual unsigned int get_cache_limit() const; virtual unsigned int get_cache_limit() const;

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

@ -489,7 +489,7 @@ get_sound(MovieAudio *sound, bool positional, int mode) {
* This is what creates a sound instance. * This is what creates a sound instance.
*/ */
PT(AudioSound) OpenALAudioManager:: PT(AudioSound) OpenALAudioManager::
get_sound(const string &file_name, bool positional, int mode) { get_sound(const Filename &file_name, bool positional, int mode) {
ReMutexHolder holder(_lock); ReMutexHolder holder(_lock);
if(!is_valid()) { if(!is_valid()) {
return get_null_sound(); return get_null_sound();
@ -525,7 +525,7 @@ get_sound(const string &file_name, bool positional, int mode) {
* use, then the sound cannot be deleted, and this function has no effect. * use, then the sound cannot be deleted, and this function has no effect.
*/ */
void OpenALAudioManager:: void OpenALAudioManager::
uncache_sound(const string& file_name) { uncache_sound(const Filename &file_name) {
ReMutexHolder holder(_lock); ReMutexHolder holder(_lock);
nassertv(is_valid()); nassertv(is_valid());
Filename path = file_name; Filename path = file_name;

4
panda/src/audiotraits/openalAudioManager.h
View File

@ -51,10 +51,10 @@ class EXPCL_OPENAL_AUDIO OpenALAudioManager : public AudioManager {
virtual bool is_valid(); virtual bool is_valid();
virtual PT(AudioSound) get_sound(const std::string&, bool positional = false, int mode=SM_heuristic); virtual PT(AudioSound) get_sound(const Filename &, bool positional = false, int mode=SM_heuristic);
virtual PT(AudioSound) get_sound(MovieAudio *sound, bool positional = false, int mode=SM_heuristic); virtual PT(AudioSound) get_sound(MovieAudio *sound, bool positional = false, int mode=SM_heuristic);
virtual void uncache_sound(const std::string&); virtual void uncache_sound(const Filename &);
virtual void clear_cache(); virtual void clear_cache();
virtual void set_cache_limit(unsigned int count); virtual void set_cache_limit(unsigned int count);
virtual unsigned int get_cache_limit() const; virtual unsigned int get_cache_limit() const;