Don't continue parsing after processing version line

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

diff --git a/simgear/sound/sample_openal.cxx b/simgear/sound/sample_openal.cxx
index 7b3550027c114e9ceb3cdab86cd3f6e511408121..95a6077559822deda6ff7e0f99a67cfc02eba758 100644 (file)
--- a/simgear/sound/sample_openal.cxx
+++ b/simgear/sound/sample_openal.cxx
@@ -26,17 +26,22 @@
 #  include <simgear_config.h>
 #endif
 
-#include <stdlib.h>    // rand()
+#include <stdlib.h>    // rand(), free()
 #include <cstring>
+#include <stdio.h>
 
 #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
@@ -44,6 +49,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()),
@@ -54,13 +65,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),
@@ -71,14 +77,24 @@ SGSoundSample::SGSoundSample() :
     _max_dist(3000.0),
     _loop(AL_FALSE),
     _playing(false),
-    _changed(true),
     _static_changed(true),
-    _is_file(false)
+    _out_of_range(false),
+    _is_file(false),
+    _use_pos_props(false)
 {
+    _pos_prop[0] = 0;
+    _pos_prop[1] = 0;
+    _pos_prop[2] = 0;
 }
 
 // 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()),
@@ -89,13 +105,8 @@ SGSoundSample::SGSoundSample( const char *path, const char *file ) :
     _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),
@@ -106,20 +117,27 @@ SGSoundSample::SGSoundSample( const char *path, const char *file ) :
     _max_dist(3000.0),
     _loop(AL_FALSE),
     _playing(false),
-    _changed(true),
     _static_changed(true),
-    _is_file(true)
+    _out_of_range(false),
+    _is_file(true),
+    _use_pos_props(false)
 {
-    SGPath samplepath( path );
-    if ( strlen(file) ) {
-        samplepath.append( file );
-    }
-    _refname = samplepath.str();
+    SGPath p = simgear::ResourceManager::instance()->findPath(file, currentDir);
+    _refname = p.str();
+    _pos_prop[0] = 0;
+    _pos_prop[1] = 0;
+    _pos_prop[2] = 0;
 }
 
 // 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()),
@@ -129,13 +147,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),
@@ -146,16 +159,26 @@ SGSoundSample::SGSoundSample( const unsigned char** data,
     _max_dist(3000.0),
     _loop(AL_FALSE),
     _playing(false),
-    _changed(true),
     _static_changed(true),
-    _is_file(false)
+    _out_of_range(false),
+    _is_file(false),
+    _use_pos_props(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;
+    _pos_prop[0] = 0;
+    _pos_prop[1] = 0;
+    _pos_prop[2] = 0;
 }
 
 // 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()),
@@ -165,13 +188,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),
@@ -182,12 +200,16 @@ SGSoundSample::SGSoundSample( void** data, int len, int freq, int format ) :
     _max_dist(3000.0),
     _loop(AL_FALSE),
     _playing(false),
-    _changed(true),
     _static_changed(true),
-    _is_file(false)
+    _out_of_range(false),
+    _is_file(false),
+    _use_pos_props(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;
+    _pos_prop[0] = 0;
+    _pos_prop[1] = 0;
+    _pos_prop[2] = 0;
 }
 
 
@@ -198,9 +220,16 @@ SGSoundSample::~SGSoundSample() {
 
 void SGSoundSample::update_pos_and_orientation() {
 
-    _absolute_pos = _base_pos;
-    if (_relative_pos[0] || _relative_pos[1] || _relative_pos[2] ) {
-       _absolute_pos += _rotation.rotate( _relative_pos );
+    if (_use_pos_props) {
+        if (_pos_prop[0]) _absolute_pos[0] = _pos_prop[0]->getDoubleValue();
+        if (_pos_prop[1]) _absolute_pos[1] = _pos_prop[1]->getDoubleValue();
+        if (_pos_prop[2]) _absolute_pos[2] = _pos_prop[2]->getDoubleValue();
+    }
+    else {
+        _absolute_pos = _base_pos;
+        if (_relative_pos[0] || _relative_pos[1] || _relative_pos[2] ) {
+           _absolute_pos += _rotation.rotate( _relative_pos );
+        }
     }
 
     _orivec = SGVec3f::zeros();
@@ -229,4 +258,7 @@ SGPath SGSoundSample::file_path() const
   return SGPath(_refname);
 }
 
-
+void SGSoundSample::free_data()
+{
+   if ( _data != NULL ) free( _data ); _data = NULL;
+}