#include <simgear/compiler.h>
-#if defined (__APPLE__)
-# ifdef __GNUC__
-# if ( __GNUC__ >= 3 ) && ( __GNUC_MINOR__ >= 3 )
-// # include <math.h>
-inline int (isnan)(double r) { return !(r <= 0 || r >= 0); }
-# else
- // any C++ header file undefines isinf and isnan
- // so this should be included before <iostream>
- // the functions are STILL in libm (libSystem on mac os x)
-extern "C" int isnan (double);
-extern "C" int isinf (double);
-# endif
-# else
-// inline int (isinf)(double r) { return isinf(r); }
-// inline int (isnan)(double r) { return isnan(r); }
-# endif
-#endif
-
-#if defined (__FreeBSD__)
-# if __FreeBSD_version < 500000
- extern "C" {
- inline int isnan(double r) { return !(r <= 0 || r >= 0); }
- }
-# endif
-#endif
-
-#if defined (__CYGWIN__)
-# include <ieeefp.h>
-#endif
-
-#if defined(__MINGW32__)
-# define isnan(x) _isnan(x)
-#endif
-
#include "soundmgr_openal.hxx"
#include "sample_group.hxx"
+bool isNaN(float *v) {
+ return (isnan(v[0]) || isnan(v[1]) || isnan(v[2]));
+}
+
SGSampleGroup::SGSampleGroup () :
_smgr(NULL),
_refname(""),
unsigned int size = _removed_samples.size();
for (unsigned int i=0; i<size; ) {
SGSoundSample *sample = _removed_samples[i];
- ALint result;
+ ALint result = AL_STOPPED;
+
+ if ( sample->is_valid_source() ) {
+ if ( sample->is_looping() ) {
+ sample->no_valid_source();
+ _smgr->release_source( sample->get_source() );
+ }
+ else
+ alGetSourcei( sample->get_source(), AL_SOURCE_STATE, &result );
+ }
- alGetSourcei( sample->get_source(), AL_SOURCE_STATE, &result );
if ( result == AL_STOPPED ) {
ALuint buffer = sample->get_buffer();
alDeleteBuffers( 1, &buffer );
continue;
// start playing the sample
- ALboolean looping = sample->get_looping() ? AL_TRUE : AL_FALSE;
ALuint buffer = sample->get_buffer();
ALuint source = _smgr->request_source();
if (alIsSource(source) == AL_TRUE && alIsBuffer(buffer) == AL_TRUE)
sample->set_source( source );
update_sample_config( sample );
- alSourcei( source, AL_SOURCE_RELATIVE, AL_FALSE );
+ ALboolean looping = sample->is_looping() ? AL_TRUE : AL_FALSE;
alSourcei( source, AL_LOOPING, looping );
alSourcef( source, AL_ROLLOFF_FACTOR, 1.0 );
+ alSourcei( source, AL_SOURCE_RELATIVE, AL_FALSE );
alSourcePlay( source );
testForALError("sample play");
} else {
if ( !sample->is_playing() ) {
// a request to stop playing the sound has been filed.
- sample->no_valid_source();
sample->stop();
+ sample->no_valid_source();
_smgr->release_source( sample->get_source() );
- } else {
+ } else if ( _smgr->has_changed() ) {
update_sample_config( sample );
}
alGetSourcei( source, AL_SOURCE_STATE, &result );
if ( result == AL_STOPPED ) {
// sample is stoped because it wasn't looping
- sample->no_valid_source();
sample->stop();
+ sample->no_valid_source();
_smgr->release_source( source );
+ _smgr->release_buffer( sample );
+ remove( sample->get_sample_name() );
}
}
testForALError("update");
}
// add a sound effect, return true if successful
-bool SGSampleGroup::add( SGSoundSample *sound, const string& refname ) {
+bool SGSampleGroup::add( SGSharedPtr<SGSoundSample> sound, const string& refname ) {
sample_map_iterator sample_it = _samples.find( refname );
if ( sample_it != _samples.end() ) {
return false;
}
- _removed_samples.push_back( sample_it->second );
+ if ( sample_it->second->is_valid_buffer() )
+ _removed_samples.push_back( sample_it->second );
_samples.erase( sample_it );
return true;
}
// set source velocity of all managed sounds
-void SGSampleGroup::set_velocity( const SGVec3d &vel ) {
+void SGSampleGroup::set_velocity( const SGVec3f &vel ) {
if ( isnan(vel[0]) || isnan(vel[1]) || isnan(vel[2]) )
{
SG_LOG( SG_GENERAL, SG_ALERT, "NAN's found in SampleGroup velocity");
}
void SGSampleGroup::update_sample_config( SGSoundSample *sample ) {
- if ( sample->is_valid_source() ) {
- unsigned int source = sample->get_source();
-
- if ( _tied_to_listener && _smgr->has_changed() ) {
- alSourcefv( source, AL_POSITION, _smgr->get_position().data() );
- alSourcefv( source, AL_DIRECTION, _smgr->get_direction().data() );
- alSourcefv( source, AL_VELOCITY, _smgr->get_velocity().data() );
- } else {
- alSourcefv( source, AL_POSITION, sample->get_position() );
- alSourcefv( source, AL_DIRECTION, sample->get_orientation() );
- alSourcefv( source, AL_VELOCITY, sample->get_velocity() );
- }
- testForALError("position and orientation");
-
- alSourcef( source, AL_PITCH, sample->get_pitch() );
- alSourcef( source, AL_GAIN, sample->get_volume() );
- testForALError("pitch and gain");
-
- if ( sample->has_static_data_changed() ) {
- alSourcef( source, AL_CONE_INNER_ANGLE, sample->get_innerangle() );
- alSourcef( source, AL_CONE_OUTER_ANGLE, sample->get_outerangle() );
- alSourcef( source, AL_CONE_OUTER_GAIN, sample->get_outergain() );
- testForALError("audio cone");
-
- alSourcef( source, AL_MAX_DISTANCE, sample->get_max_dist() );
- alSourcef( source, AL_REFERENCE_DISTANCE,
- sample->get_reference_dist() );
- testForALError("distance rolloff");
- }
+ SGVec3f orientation, velocity;
+ SGVec3d position;
+
+ if ( _tied_to_listener ) {
+ orientation = _smgr->get_direction();
+ position = _smgr->get_position();
+ velocity = _smgr->get_velocity();
+ } else {
+ sample->update_absolute_position();
+ orientation = sample->get_orientation();
+ position = sample->get_position();
+ velocity = sample->get_velocity();
+ }
+
+ if (dist(position, _smgr->get_position()) > 10000)
+ printf("source and listener distance greater than 20km!\n");
+ if (isNaN(toVec3f(position).data())) printf("NaN in source position\n");
+ if (isNaN(orientation.data())) printf("NaN in source orientation\n");
+ if (isNaN(velocity.data())) printf("NaN in source velocity\n");
+
+ unsigned int source = sample->get_source();
+ alSourcefv( source, AL_POSITION, toVec3f(position).data() );
+ alSourcefv( source, AL_VELOCITY, velocity.data() );
+ alSourcefv( source, AL_DIRECTION, orientation.data() );
+ testForALError("position and orientation");
+
+ alSourcef( source, AL_PITCH, sample->get_pitch() );
+ alSourcef( source, AL_GAIN, sample->get_volume() );
+ testForALError("pitch and gain");
+
+ if ( sample->has_static_data_changed() ) {
+ alSourcef( source, AL_CONE_INNER_ANGLE, sample->get_innerangle() );
+ alSourcef( source, AL_CONE_OUTER_ANGLE, sample->get_outerangle() );
+ alSourcef( source, AL_CONE_OUTER_GAIN, sample->get_outergain() );
+ testForALError("audio cone");
+
+ alSourcef( source, AL_MAX_DISTANCE, sample->get_max_dist() );
+ alSourcef( source, AL_REFERENCE_DISTANCE,
+ sample->get_reference_dist() );
+ testForALError("distance rolloff");
}
}
projects / simgear.git / blobdiff