don't only complain that the volume is larger than 1.0, but say how much

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

diff --git a/simgear/sound/xmlsound.cxx b/simgear/sound/xmlsound.cxx
index 48a2d0ee2b7acf8c00bd61ec0872fbe1659f098c..078dffd76bfa92ea28c6631ac902ad628acdcaa6 100644 (file)
--- a/simgear/sound/xmlsound.cxx
+++ b/simgear/sound/xmlsound.cxx
@@ -17,22 +17,21 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include <simgear/compiler.h>
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <cmath>
-#else
-#  include <math.h>
-#endif
 #include <string.h>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/props/condition.hxx>
-#include <simgear/math/fastmath.hxx>
+#include <simgear/math/SGMath.hxx>
 
 
 #include "xmlsound.hxx"
@@ -41,9 +40,9 @@
 // static double _snd_lin(double v)   { return v; }
 static double _snd_inv(double v)   { return (v == 0) ? 1e99 : 1/v; }
 static double _snd_abs(double v)   { return (v >= 0) ? v : -v; }
-static double _snd_sqrt(double v)  { return (v < 0) ? sqrt(-v) : sqrt(v); }
-static double _snd_log10(double v) { return (v < 1) ? 0 : fast_log10(v); }
-static double _snd_log(double v)   { return (v < 1) ? 0 : fast_log(v); }
+static double _snd_sqrt(double v)  { return sqrt(fabs(v)); }
+static double _snd_log10(double v) { return log10(fabs(v)); }
+static double _snd_log(double v)   { return log(fabs(v)); }
 // static double _snd_sqr(double v)   { return v*v; }
 // static double _snd_pow3(double v)  { return v*v*v; }
 
@@ -65,7 +64,6 @@ static const struct {
 SGXmlSound::SGXmlSound()
   : _sample(NULL),
     _condition(NULL),
-    _property(NULL),
     _active(false),
     _name(""),
     _mode(SGXmlSound::ONCE),
@@ -78,17 +76,13 @@ SGXmlSound::SGXmlSound()
 
 SGXmlSound::~SGXmlSound()
 {
-    _sample->stop();
+    if (_sample)
+        _sample->stop();
 
-    if (_property)
-        delete _property;
-
-    if (_condition)
-        delete _condition;
+    delete _condition;
 
     _volume.clear();
     _pitch.clear();
-    delete _sample;
 }
 
 void
@@ -243,7 +237,7 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr,
    SGPropertyNode_ptr pos = node->getChild("position");
    if ( pos != NULL ) {
        offset_pos[0] = pos->getDoubleValue("x", 0.0);
-       offset_pos[1] = pos->getDoubleValue("y", 0.0);
+       offset_pos[1] = -pos->getDoubleValue("y", 0.0);
        offset_pos[2] = pos->getDoubleValue("z", 0.0);
    }
 
@@ -258,22 +252,27 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr,
    pos = node->getChild("orientation");
    if ( pos != NULL ) {
       dir[0] = pos->getDoubleValue("x", 0.0);
-      dir[1] = pos->getDoubleValue("y", 0.0);
+      dir[1] = -pos->getDoubleValue("y", 0.0);
       dir[2] = pos->getDoubleValue("z", 0.0);
       inner = pos->getDoubleValue("inner-angle", 360.0);
       outer = pos->getDoubleValue("outer-angle", 360.0);
       outer_gain = pos->getDoubleValue("outer-gain", 0.0);
    }
    
-
    //
    // Initialize the sample
    //
    _mgr = sndmgr;
    if ( (_sample = _mgr->find(_name)) == NULL ) {
-       _sample = new SGSoundSample( path.c_str(),
-                                    node->getStringValue("path", ""),
-                                    true );
+       // FIXME: Does it make sense to overwrite a previous entry's
+       // configuration just because a new entry has the same name?
+       // Note that we can't match on identical "path" because we the
+       // new entry could be at a different location with different
+       // configuration so we need a new sample which creates a new
+       // "alSource".  The semantics of what is going on here seems
+       // confused and needs to be thought through more carefully.
+        _sample = new SGSoundSample( path.c_str(),
+                                    node->getStringValue("path", "") );
 
        _mgr->add( _sample, _name );
    }
@@ -425,15 +424,15 @@ SGXmlSound::update (double dt)
    //
    // Change sample state
    //
+
+   double vol = volume_offset + volume;
+   if (vol > 1.0) {
+      SG_LOG(SG_GENERAL, SG_WARN, "Sound volume too large for '"
+              << _name << "':  " << vol << "  ->  clipping to 1.0");
+      vol = 1.0;
+   }
+   _sample->set_volume(vol);
    _sample->set_pitch( pitch_offset + pitch );
-   if ((volume_offset + volume ) > 1.0)
-   {
-      _sample->set_volume( 1.0 );
-      SG_LOG(SG_GENERAL, SG_WARN,
-             "Volume larger than 1.0 in configuration for '" << _name
-              << "', clipping.");
-   } else 
-      _sample->set_volume( volume_offset + volume );
 
 
    //