#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"
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() ) {
if ( sample->is_valid_source() ) {
unsigned int source = sample->get_source();
-#if 0
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() );
+ alSourcefv( source, AL_DIRECTION, _smgr->get_direction().data() );
} else {
alSourcefv( source, AL_POSITION, sample->get_position() );
- alSourcefv( source, AL_DIRECTION, sample->get_orientation() );
alSourcefv( source, AL_VELOCITY, sample->get_velocity() );
+ alSourcefv( source, AL_DIRECTION, sample->get_orientation() );
}
-#else
- alSourcefv( source, AL_POSITION, SGVec3f::zeros().data() );
- alSourcefv( source, AL_DIRECTION, SGVec3f::zeros().data() );
- alSourcefv( source, AL_VELOCITY, SGVec3f::zeros().data() );
-#endif
testForALError("position and orientation");
alSourcef( source, AL_PITCH, sample->get_pitch() );
testForALError("pitch and gain");
if ( sample->has_static_data_changed() ) {
-#if 0
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() );
-#endif
testForALError("audio cone");
alSourcef( source, AL_MAX_DISTANCE, sample->get_max_dist() );