Reset: allow re-init of Nasal Ghosts.

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

diff --git a/simgear/sound/sample_openal.cxx b/simgear/sound/sample_openal.cxx
index 4abbb7cbc4965f484768dc08303a4b25de51b132..1fc11661d23b4af0913d8a1bf56cb119e034b838 100644 (file)
--- a/simgear/sound/sample_openal.cxx
+++ b/simgear/sound/sample_openal.cxx
@@ -26,16 +26,21 @@
 #  include <simgear_config.h>
 #endif
 
-#include <stdlib.h>    // rand()
+#include <stdlib.h>    // rand(), free()
+#include <cstring>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/structure/exception.hxx>
 #include <simgear/misc/sg_path.hxx>
-#include <simgear/math/SGQuat.hxx>
+#include <simgear/misc/ResourceManager.hxx>
 
 #include "soundmgr_openal.hxx"
 #include "sample_openal.hxx"
+#include "soundmgr_openal_private.hxx"
 
+#define AL_FALSE 0
+
+using std::string;
 
 //
 // SGSoundSample
@@ -43,6 +48,12 @@
 
 // empty constructor
 SGSoundSample::SGSoundSample() :
+    _format(AL_FORMAT_MONO8),
+    _size(0),
+    _freq(0),
+    _changed(true),
+    _valid_source(false),
+    _source(SGSoundMgr::NO_SOURCE),
     _absolute_pos(SGVec3d::zeros()),
     _relative_pos(SGVec3d::zeros()),
     _direction(SGVec3d::zeros()),
@@ -50,15 +61,11 @@ SGSoundSample::SGSoundSample() :
     _orientation(SGQuatd::zeros()),
     _orivec(SGVec3f::zeros()),
     _base_pos(SGVec3d::zeros()),
+    _rotation(SGQuatd::zeros()),
     _refname(random_string()),
     _data(NULL),
-    _format(AL_FORMAT_MONO8),
-    _size(0),
-    _freq(0),
     _valid_buffer(false),
     _buffer(SGSoundMgr::NO_BUFFER),
-    _valid_source(false),
-    _source(SGSoundMgr::NO_SOURCE),
     _inner_angle(360.0),
     _outer_angle(360.0),
     _outer_gain(0.0),
@@ -69,14 +76,20 @@ SGSoundSample::SGSoundSample() :
     _max_dist(3000.0),
     _loop(AL_FALSE),
     _playing(false),
-    _changed(true),
     _static_changed(true),
+    _out_of_range(false),
     _is_file(false)
 {
 }
 
 // constructor
-SGSoundSample::SGSoundSample( const char *path, const char *file ) :
+SGSoundSample::SGSoundSample(const char *file, const SGPath& currentDir) :
+    _format(AL_FORMAT_MONO8),
+    _size(0),
+    _freq(0),
+    _changed(true),
+    _valid_source(false),
+    _source(SGSoundMgr::NO_SOURCE),
     _absolute_pos(SGVec3d::zeros()),
     _relative_pos(SGVec3d::zeros()),
     _direction(SGVec3d::zeros()),
@@ -84,15 +97,11 @@ SGSoundSample::SGSoundSample( const char *path, const char *file ) :
     _orientation(SGQuatd::zeros()),
     _orivec(SGVec3f::zeros()),
     _base_pos(SGVec3d::zeros()),
+    _rotation(SGQuatd::zeros()),
     _refname(file),
     _data(NULL),
-    _format(AL_FORMAT_MONO8),
-    _size(0),
-    _freq(0),
     _valid_buffer(false),
     _buffer(SGSoundMgr::NO_BUFFER),
-    _valid_source(false),
-    _source(SGSoundMgr::NO_SOURCE),
     _inner_angle(360.0),
     _outer_angle(360.0),
     _outer_gain(0.0),
@@ -103,20 +112,23 @@ SGSoundSample::SGSoundSample( const char *path, const char *file ) :
     _max_dist(3000.0),
     _loop(AL_FALSE),
     _playing(false),
-    _changed(true),
     _static_changed(true),
+    _out_of_range(false),
     _is_file(true)
 {
-    SGPath samplepath( path );
-    if ( strlen(file) ) {
-        samplepath.append( file );
-    }
-    _refname = samplepath.str();
+    SGPath p = simgear::ResourceManager::instance()->findPath(file, currentDir);
+    _refname = p.str();
 }
 
 // constructor
 SGSoundSample::SGSoundSample( const unsigned char** data,
                               int len, int freq, int format ) :
+    _format(format),
+    _size(len),
+    _freq(freq),
+    _changed(true),
+    _valid_source(false),
+    _source(SGSoundMgr::NO_SOURCE),
     _absolute_pos(SGVec3d::zeros()),
     _relative_pos(SGVec3d::zeros()),
     _direction(SGVec3d::zeros()),
@@ -124,14 +136,10 @@ SGSoundSample::SGSoundSample( const unsigned char** data,
     _orientation(SGQuatd::zeros()),
     _orivec(SGVec3f::zeros()),
     _base_pos(SGVec3d::zeros()),
+    _rotation(SGQuatd::zeros()),
     _refname(random_string()),
-    _format(format),
-    _size(len),
-    _freq(freq),
     _valid_buffer(false),
     _buffer(SGSoundMgr::NO_BUFFER),
-    _valid_source(false),
-    _source(SGSoundMgr::NO_SOURCE),
     _inner_angle(360.0),
     _outer_angle(360.0),
     _outer_gain(0.0),
@@ -142,16 +150,22 @@ SGSoundSample::SGSoundSample( const unsigned char** data,
     _max_dist(3000.0),
     _loop(AL_FALSE),
     _playing(false),
-    _changed(true),
     _static_changed(true),
+    _out_of_range(false),
     _is_file(false)
 {
-    SG_LOG( SG_GENERAL, SG_DEBUG, "In memory sounds sample" );
+    SG_LOG( SG_SOUND, SG_DEBUG, "In memory sounds sample" );
     _data = (unsigned char*)*data; *data = NULL;
 }
 
 // constructor
 SGSoundSample::SGSoundSample( void** data, int len, int freq, int format ) :
+    _format(format),
+    _size(len),
+    _freq(freq),
+    _changed(true),
+    _valid_source(false),
+    _source(SGSoundMgr::NO_SOURCE),
     _absolute_pos(SGVec3d::zeros()),
     _relative_pos(SGVec3d::zeros()),
     _direction(SGVec3d::zeros()),
@@ -159,14 +173,10 @@ SGSoundSample::SGSoundSample( void** data, int len, int freq, int format ) :
     _orientation(SGQuatd::zeros()),
     _orivec(SGVec3f::zeros()),
     _base_pos(SGVec3d::zeros()),
+    _rotation(SGQuatd::zeros()),
     _refname(random_string()),
-    _format(format),
-    _size(len),
-    _freq(freq),
     _valid_buffer(false),
     _buffer(SGSoundMgr::NO_BUFFER),
-    _valid_source(false),
-    _source(SGSoundMgr::NO_SOURCE),
     _inner_angle(360.0),
     _outer_angle(360.0),
     _outer_gain(0.0),
@@ -177,32 +187,31 @@ SGSoundSample::SGSoundSample( void** data, int len, int freq, int format ) :
     _max_dist(3000.0),
     _loop(AL_FALSE),
     _playing(false),
-    _changed(true),
     _static_changed(true),
+    _out_of_range(false),
     _is_file(false)
 {
-    SG_LOG( SG_GENERAL, SG_DEBUG, "In memory sounds sample" );
+    SG_LOG( SG_SOUND, SG_DEBUG, "In memory sounds sample" );
     _data = (unsigned char*)*data; *data = NULL;
 }
 
 
 // destructor
 SGSoundSample::~SGSoundSample() {
-    if (_data) free(_data);
+    if ( _data != NULL ) free(_data);
 }
 
 void SGSoundSample::update_pos_and_orientation() {
 
     _absolute_pos = _base_pos;
-    if ( _relative_pos[0] || _relative_pos[1] || _relative_pos[2] ) {
-        _absolute_pos += _orientation.backTransform(_relative_pos);
+    if (_relative_pos[0] || _relative_pos[1] || _relative_pos[2] ) {
+       _absolute_pos += _rotation.rotate( _relative_pos );
     }
 
+    _orivec = SGVec3f::zeros();
     if ( _direction[0] || _direction[1] || _direction[2] ) {
-        _orivec = toVec3f( _orientation.rotate(_direction) );
+        _orivec = toVec3f( _rotation.rotate( _direction ) );
     }
-    else
-        _orivec = SGVec3f::zeros();
 }
 
 string SGSoundSample::random_string() {
@@ -216,3 +225,16 @@ string SGSoundSample::random_string() {
       return rstr;
 }
 
+SGPath SGSoundSample::file_path() const
+{
+  if (!_is_file) {
+    return SGPath();
+  }
+  
+  return SGPath(_refname);
+}
+
+void SGSoundSample::free_data()
+{
+   if ( _data != NULL ) free( _data ); _data = NULL;
+}