cppbind.Ghost: clean up a bit

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

diff --git a/simgear/sound/sample_openal.cxx b/simgear/sound/sample_openal.cxx
index 3c9cb864ad81403fc1d06794c3722046bde1d35f..1fc11661d23b4af0913d8a1bf56cb119e034b838 100644 (file)
--- a/simgear/sound/sample_openal.cxx
+++ b/simgear/sound/sample_openal.cxx
@@ -26,18 +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/SGMath.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
@@ -45,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()),
@@ -55,13 +64,8 @@ SGSoundSample::SGSoundSample() :
     _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),
@@ -72,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 *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()),
@@ -90,13 +100,8 @@ SGSoundSample::SGSoundSample(const char *file, const SGPath& currentDir) :
     _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),
@@ -107,8 +112,8 @@ SGSoundSample::SGSoundSample(const char *file, const SGPath& currentDir) :
     _max_dist(3000.0),
     _loop(AL_FALSE),
     _playing(false),
-    _changed(true),
     _static_changed(true),
+    _out_of_range(false),
     _is_file(true)
 {
     SGPath p = simgear::ResourceManager::instance()->findPath(file, currentDir);
@@ -118,6 +123,12 @@ SGSoundSample::SGSoundSample(const char *file, const SGPath& currentDir) :
 // 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()),
@@ -127,13 +138,8 @@ SGSoundSample::SGSoundSample( const unsigned char** data,
     _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),
@@ -144,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()),
@@ -163,13 +175,8 @@ SGSoundSample::SGSoundSample( void** data, int len, int freq, int format ) :
     _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),
@@ -180,11 +187,11 @@ 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;
 }
 
@@ -227,4 +234,7 @@ SGPath SGSoundSample::file_path() const
   return SGPath(_refname);
 }
 
-
+void SGSoundSample::free_data()
+{
+   if ( _data != NULL ) free( _data ); _data = NULL;
+}