mirror of
https://github.com/panda3d/panda3d.git
synced 2026-04-22 06:28:43 -05:00
Fixed a sound bug
This commit is contained in:
Josh Yelon
@@ -71,7 +71,9 @@ FmodAudioSound(AudioManager *manager, string file_name, bool positional) {
|
||||
_sideright = 1;
|
||||
|
||||
//Assign the values we need
|
||||
DCAST_INTO_V(_manager, manager);
|
||||
FmodAudioManager *fmanager;
|
||||
DCAST_INTO_V(fmanager, manager);
|
||||
_manager = fmanager;
|
||||
|
||||
//_channel = 0;
|
||||
_file_name = file_name;
|
||||
|
||||
@@ -35,19 +35,19 @@
|
||||
//never have done sound programming before, is how the FMOD-EX API works.
|
||||
//
|
||||
//With FMOD-EX the guys at Firelight, adopted a model of managing sounds with FMOD
|
||||
//similar to how a Sound Designer creates sound in a sound studio using ‘SOUNDS’
|
||||
//and ‘CHANNELS’. Although this may seem strange at first, if you are not familiar
|
||||
//similar to how a Sound Designer creates sound in a sound studio using SOUNDS
|
||||
//and CHANNELS. Although this may seem strange at first, if you are not familiar
|
||||
//with sound programming, there is a very good metaphor you are probably already
|
||||
//familiar with to explain how FMOD-EX works.
|
||||
//
|
||||
//Think of you standard GUI API. Usually a GUI API is made up of two things:
|
||||
//Windows and Widgets. These correspond to ‘CHANNELS’ and ‘SOUNDS’, where a
|
||||
//Windows and Widgets. These correspond to CHANNELS and SOUNDS, where a
|
||||
//Channel is a Window and a Sound is Widget. Sounds are played within channels,
|
||||
//and channels don’t exist unless they have something to display.
|
||||
//
|
||||
//Now why am I explaining all of this? When PANDA was created they set up the
|
||||
//basic audio classes to handle only the idea of a ‘SOUND’. The idea of a
|
||||
//‘Channel’ really wasn't prevalent as in more modern Audio APIs. With this rewrite
|
||||
//basic audio classes to handle only the idea of a SOUND. The idea of a
|
||||
//Channel really wasn't prevalent as in more modern Audio APIs. With this rewrite
|
||||
//of PANDA to use the FMOD-EX API, the PANDA FmodAudioSound Class, now has to
|
||||
//handle two different parts of the FMOD-EX API in order to play a sound.
|
||||
//
|
||||
@@ -57,7 +57,7 @@
|
||||
//
|
||||
//Ultimately this isn’t a problem expect for a couple situations when you go to
|
||||
//play a sound, which I will explain in more detail in that part of the code. All
|
||||
//that you have to know right now is that ‘Channels’ in FMOD do not exist
|
||||
//that you have to know right now is that Channels in FMOD do not exist
|
||||
//unless they are playing a sound. And in the PANDA FmodAudioSound API class there
|
||||
//is only ONE dedicated channel per sound.
|
||||
//Otherwise there is really nothing to worry about.
|
||||
@@ -82,173 +82,173 @@ class FmodAudioDSP;
|
||||
|
||||
|
||||
class EXPCL_FMOD_AUDIO FmodAudioSound : public AudioSound {
|
||||
public:
|
||||
public:
|
||||
|
||||
FmodAudioSound(AudioManager *manager, string file_name, bool positional );
|
||||
~FmodAudioSound();
|
||||
|
||||
// For best compatability, set the loop_count, start_time,
|
||||
// volume, and balance, prior to calling play(). You may
|
||||
// set them while they're playing, but it's implementation
|
||||
// specific whether you get the results.
|
||||
void play();
|
||||
void stop();
|
||||
|
||||
// loop: false = play once; true = play forever.
|
||||
// inits to false.
|
||||
void set_loop(bool loop=true);
|
||||
bool get_loop() const;
|
||||
|
||||
// loop_count: 0 = forever; 1 = play once; n = play n times.
|
||||
// inits to 1.
|
||||
void set_loop_count(unsigned long loop_count=1);
|
||||
unsigned long get_loop_count() const;
|
||||
|
||||
// 0 = begining; length() = end.
|
||||
// inits to 0.0.
|
||||
void set_time(float start_time=0.0);
|
||||
float get_time() const;
|
||||
|
||||
// 0 = minimum; 1.0 = maximum.
|
||||
// inits to 1.0.
|
||||
void set_volume(float volume=1.0);
|
||||
float get_volume() const;
|
||||
|
||||
// -1.0 is hard left
|
||||
// 0.0 is centered
|
||||
// 1.0 is hard right
|
||||
// inits to 0.0.
|
||||
void set_balance(float balance_right=0.0);
|
||||
float get_balance() const;
|
||||
FmodAudioSound(AudioManager *manager, string file_name, bool positional );
|
||||
~FmodAudioSound();
|
||||
|
||||
// For best compatability, set the loop_count, start_time,
|
||||
// volume, and balance, prior to calling play(). You may
|
||||
// set them while they're playing, but it's implementation
|
||||
// specific whether you get the results.
|
||||
void play();
|
||||
void stop();
|
||||
|
||||
// loop: false = play once; true = play forever.
|
||||
// inits to false.
|
||||
void set_loop(bool loop=true);
|
||||
bool get_loop() const;
|
||||
|
||||
// loop_count: 0 = forever; 1 = play once; n = play n times.
|
||||
// inits to 1.
|
||||
void set_loop_count(unsigned long loop_count=1);
|
||||
unsigned long get_loop_count() const;
|
||||
|
||||
// 0 = begining; length() = end.
|
||||
// inits to 0.0.
|
||||
void set_time(float start_time=0.0);
|
||||
float get_time() const;
|
||||
|
||||
// 0 = minimum; 1.0 = maximum.
|
||||
// inits to 1.0.
|
||||
void set_volume(float volume=1.0);
|
||||
float get_volume() const;
|
||||
|
||||
// -1.0 is hard left
|
||||
// 0.0 is centered
|
||||
// 1.0 is hard right
|
||||
// inits to 0.0.
|
||||
void set_balance(float balance_right=0.0);
|
||||
float get_balance() const;
|
||||
|
||||
// play_rate is any positive float value.
|
||||
// inits to 1.0.
|
||||
void set_play_rate(float play_rate=1.0f);
|
||||
float get_play_rate() const;
|
||||
// play_rate is any positive float value.
|
||||
// inits to 1.0.
|
||||
void set_play_rate(float play_rate=1.0f);
|
||||
float get_play_rate() const;
|
||||
|
||||
const string& get_name() const;
|
||||
|
||||
// return: playing time in seconds.
|
||||
float length() const;
|
||||
const string& get_name() const;
|
||||
|
||||
// return: playing time in seconds.
|
||||
float length() const;
|
||||
|
||||
// Controls the position of this sound's emitter.
|
||||
// pos is a pointer to an xyz triplet of the emitter's position.
|
||||
// vel is a pointer to an xyz triplet of the emitter's velocity.
|
||||
void set_3d_attributes(float px, float py, float pz, float vx, float vy, float vz);
|
||||
void get_3d_attributes(float *px, float *py, float *pz, float *vx, float *vy, float *vz);
|
||||
// Controls the position of this sound's emitter.
|
||||
// pos is a pointer to an xyz triplet of the emitter's position.
|
||||
// vel is a pointer to an xyz triplet of the emitter's velocity.
|
||||
void set_3d_attributes(float px, float py, float pz, float vx, float vy, float vz);
|
||||
void get_3d_attributes(float *px, float *py, float *pz, float *vx, float *vy, float *vz);
|
||||
|
||||
void set_3d_min_distance(float dist);
|
||||
float get_3d_min_distance() const;
|
||||
void set_3d_min_distance(float dist);
|
||||
float get_3d_min_distance() const;
|
||||
|
||||
void set_3d_max_distance(float dist);
|
||||
float get_3d_max_distance() const;
|
||||
|
||||
AudioSound::SoundStatus status() const;
|
||||
void set_3d_max_distance(float dist);
|
||||
float get_3d_max_distance() const;
|
||||
|
||||
AudioSound::SoundStatus status() const;
|
||||
|
||||
virtual bool add_dsp( PT(AudioDSP) dspToAdd );
|
||||
virtual bool remove_dsp( PT(AudioDSP) x);
|
||||
virtual bool add_dsp( PT(AudioDSP) dspToAdd );
|
||||
virtual bool remove_dsp( PT(AudioDSP) x);
|
||||
|
||||
virtual float get_speaker_mix(int speaker);
|
||||
virtual void set_speaker_mix(float frontleft, float frontright, float center, float sub, float backleft, float backright, float sideleft, float sideright);
|
||||
virtual float get_speaker_mix(int speaker);
|
||||
virtual void set_speaker_mix(float frontleft, float frontright, float center, float sub, float backleft, float backright, float sideleft, float sideright);
|
||||
|
||||
//THESE ARE NOT USED ANYMORE.
|
||||
//THEY ARE ONLY HERE BECAUSE THEY are still needed by Miles.
|
||||
//THESE are stubs in FMOD-EX version
|
||||
////////////////////////////////////////////////////////////////////
|
||||
void set_active(bool active=true);
|
||||
bool get_active() const;
|
||||
//THESE ARE NOT USED ANYMORE.
|
||||
//THEY ARE ONLY HERE BECAUSE THEY are still needed by Miles.
|
||||
//THESE are stubs in FMOD-EX version
|
||||
////////////////////////////////////////////////////////////////////
|
||||
void set_active(bool active=true);
|
||||
bool get_active() const;
|
||||
|
||||
void finished();
|
||||
void set_finished_event(const string& event);
|
||||
const string& get_finished_event() const;
|
||||
////////////////////////////////////////////////////////////////////
|
||||
void finished();
|
||||
void set_finished_event(const string& event);
|
||||
const string& get_finished_event() const;
|
||||
////////////////////////////////////////////////////////////////////
|
||||
|
||||
protected:
|
||||
|
||||
private:
|
||||
FmodAudioManager *_manager;
|
||||
FMOD::Sound *_sound;
|
||||
FMOD::Channel *_channel;
|
||||
protected:
|
||||
|
||||
private:
|
||||
PT(FmodAudioManager) _manager;
|
||||
FMOD::Sound *_sound;
|
||||
FMOD::Channel *_channel;
|
||||
|
||||
string _file_name;
|
||||
string _file_name;
|
||||
|
||||
float _volume;
|
||||
float _balance;
|
||||
float _playrate;
|
||||
int _priority;
|
||||
float _volume;
|
||||
float _balance;
|
||||
float _playrate;
|
||||
int _priority;
|
||||
|
||||
float _sampleFrequency;
|
||||
mutable float _length; //in seconds.
|
||||
float _sampleFrequency;
|
||||
mutable float _length; //in seconds.
|
||||
|
||||
FMOD_SPEAKERMODE _speakermode;
|
||||
FMOD_SPEAKERMODE _speakermode;
|
||||
|
||||
float _frontleft;
|
||||
float _frontright;
|
||||
float _center;
|
||||
float _sub;
|
||||
float _backleft;
|
||||
float _backright;
|
||||
float _sideleft;
|
||||
float _sideright;
|
||||
float _frontleft;
|
||||
float _frontright;
|
||||
float _center;
|
||||
float _sub;
|
||||
float _backleft;
|
||||
float _backright;
|
||||
float _sideleft;
|
||||
float _sideright;
|
||||
|
||||
FMOD_VECTOR _location;
|
||||
FMOD_VECTOR _velocity;
|
||||
FMOD_VECTOR _location;
|
||||
FMOD_VECTOR _velocity;
|
||||
|
||||
float _min_dist;
|
||||
float _max_dist;
|
||||
float _min_dist;
|
||||
float _max_dist;
|
||||
|
||||
void play2DSound();
|
||||
void play3DSound();
|
||||
void play2DSound();
|
||||
void play3DSound();
|
||||
|
||||
void prepareSound();
|
||||
void prepare2DSound();
|
||||
void prepare3DSound();
|
||||
void prepareSound();
|
||||
void prepare2DSound();
|
||||
void prepare3DSound();
|
||||
|
||||
void set_volume_on_channel();
|
||||
void set_balance_on_channel();
|
||||
void set_play_rate_on_channel();
|
||||
void set_speaker_mix_on_channel();
|
||||
void add_dsp_on_channel();
|
||||
void set_speaker_mix_or_balance_on_channel();
|
||||
void set_volume_on_channel();
|
||||
void set_balance_on_channel();
|
||||
void set_play_rate_on_channel();
|
||||
void set_speaker_mix_on_channel();
|
||||
void add_dsp_on_channel();
|
||||
void set_speaker_mix_or_balance_on_channel();
|
||||
|
||||
virtual int get_priority();
|
||||
virtual void set_priority(int priority);
|
||||
virtual int get_priority();
|
||||
virtual void set_priority(int priority);
|
||||
|
||||
//The Data Structure that holds all the DSPs.
|
||||
typedef pset<PT (FmodAudioDSP) > DSPSet;
|
||||
DSPSet _sound_dsp;
|
||||
//The Data Structure that holds all the DSPs.
|
||||
typedef pset<PT (FmodAudioDSP) > DSPSet;
|
||||
DSPSet _sound_dsp;
|
||||
|
||||
//THESE AREN'T USED ANYMORE.
|
||||
//THEY ARE ONLY HERE BECAUSE THEY are still need by Miles.
|
||||
//THESE are stubs in FMOD-EX version
|
||||
string _finished_event;
|
||||
//THESE AREN'T USED ANYMORE.
|
||||
//THEY ARE ONLY HERE BECAUSE THEY are still need by Miles.
|
||||
//THESE are stubs in FMOD-EX version
|
||||
string _finished_event;
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
//These are needed for Panda's Pointer System. DO NOT ERASE!
|
||||
////////////////////////////////////////////////////////////
|
||||
////////////////////////////////////////////////////////////
|
||||
//These are needed for Panda's Pointer System. DO NOT ERASE!
|
||||
////////////////////////////////////////////////////////////
|
||||
|
||||
public:
|
||||
static TypeHandle get_class_type() {
|
||||
return _type_handle;
|
||||
}
|
||||
static void init_type() {
|
||||
AudioSound::init_type();
|
||||
register_type(_type_handle, "FmodAudioSound", AudioSound::get_class_type());
|
||||
}
|
||||
virtual TypeHandle get_type() const {
|
||||
return get_class_type();
|
||||
}
|
||||
virtual TypeHandle force_init_type() {
|
||||
init_type();
|
||||
return get_class_type();
|
||||
}
|
||||
public:
|
||||
static TypeHandle get_class_type() {
|
||||
return _type_handle;
|
||||
}
|
||||
static void init_type() {
|
||||
AudioSound::init_type();
|
||||
register_type(_type_handle, "FmodAudioSound", AudioSound::get_class_type());
|
||||
}
|
||||
virtual TypeHandle get_type() const {
|
||||
return get_class_type();
|
||||
}
|
||||
virtual TypeHandle force_init_type() {
|
||||
init_type();
|
||||
return get_class_type();
|
||||
}
|
||||
|
||||
private:
|
||||
static TypeHandle _type_handle;
|
||||
private:
|
||||
static TypeHandle _type_handle;
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
//DONE
|
||||
////////////////////////////////////////////////////////////
|
||||
////////////////////////////////////////////////////////////
|
||||
//DONE
|
||||
////////////////////////////////////////////////////////////
|
||||
};
|
||||
|
||||
#include "fmodAudioSound.I"
|
||||
|
||||
Reference in New Issue
Block a user