implement a round-robin scheme for random objects to make sure the same type of objec...

[simgear.git] / simgear / sound / sample_openal.cxx

diff --git a/simgear/sound/sample_openal.cxx b/simgear/sound/sample_openal.cxx
index 21e7cf711b10bae9a7c6367a4ec2066ffa698aac..16291d7da918bd15dd51c35853710e86cf2e04ec 100644 (file)
--- a/simgear/sound/sample_openal.cxx
+++ b/simgear/sound/sample_openal.cxx
@@ -31,7 +31,7 @@
 #include <simgear/debug/logstream.hxx>
 #include <simgear/structure/exception.hxx>
 #include <simgear/misc/sg_path.hxx>
-#include <simgear/math/SGQuat.hxx>
+#include <simgear/math/SGMath.hxx>
 
 #include "soundmgr_openal.hxx"
 #include "sample_openal.hxx"
@@ -192,17 +192,15 @@ SGSoundSample::SGSoundSample( void** data, int len, int freq, int format ) :
 
 // destructor
 SGSoundSample::~SGSoundSample() {
-    if (_data) free(_data);
+    if ( _data != NULL ) free(_data);
 }
 
 void SGSoundSample::update_pos_and_orientation() {
 
     _absolute_pos = _base_pos;
-#if 0
-    if ( _relative_pos[0] || _relative_pos[1] || _relative_pos[2] ) {
-        _absolute_pos += _rotation.backTransform( _relative_pos );
+    if (_relative_pos[0] || _relative_pos[1] || _relative_pos[2] ) {
+       _absolute_pos += _rotation.rotate( _relative_pos );
     }
-#endif
 
     _orivec = SGVec3f::zeros();
     if ( _direction[0] || _direction[1] || _direction[2] ) {