#348: (continued) Missing sound files not reported properly

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

diff --git a/simgear/sound/xmlsound.cxx b/simgear/sound/xmlsound.cxx
index 45b303a19735588c2ee51c81b54c6415b09763c5..3e90752ea3f8e9f7a7a6f7bb7993152b336aaf0a 100644 (file)
--- a/simgear/sound/xmlsound.cxx
+++ b/simgear/sound/xmlsound.cxx
@@ -32,7 +32,8 @@
 #include <simgear/debug/logstream.hxx>
 #include <simgear/props/condition.hxx>
 #include <simgear/math/SGMath.hxx>
-
+#include <simgear/structure/exception.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include "xmlsound.hxx"
 
@@ -67,7 +68,8 @@ SGXmlSound::SGXmlSound()
     _dt_play(0.0),
     _dt_stop(0.0),
     _delay(0.0),
-    _stopping(0.0)
+    _stopping(0.0),
+    _initialized(false)
 {
 }
 
@@ -82,7 +84,8 @@ SGXmlSound::~SGXmlSound()
 
 void
 SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
-                 SGSampleGroup *sgrp, const string &path)
+                 SGSampleGroup *sgrp, SGSampleGroup *avionics,
+                 const SGPath& currentDir)
 {
 
    //
@@ -92,18 +95,26 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
    _name = node->getStringValue("name", "");
    SG_LOG(SG_GENERAL, SG_DEBUG, "Loading sound information for: " << _name );
 
-   const char *mode_str = node->getStringValue("mode", "");
-   if ( !strcmp(mode_str, "looped") ) {
+   string mode_str = node->getStringValue("mode", "");
+   if ( mode_str == "looped" ) {
        _mode = SGXmlSound::LOOPED;
 
-   } else if ( !strcmp(mode_str, "in-transit") ) {
+   } else if ( mode_str == "in-transit" ) {
        _mode = SGXmlSound::IN_TRANSIT;
 
    } else {
       _mode = SGXmlSound::ONCE;
    }
 
-   _property = root->getNode(node->getStringValue("property", ""), true);
+   bool is_avionics = false;
+   string type_str = node->getStringValue("type", "fx");
+   if ( type_str == "avionics" )
+      is_avionics = true;
+
+   string propval = node->getStringValue("property", "");
+   if (propval != "")
+      _property = root->getNode(propval, true);
+
    SGPropertyNode *condition = node->getChild("condition");
    if (condition != NULL)
       _condition = sgReadCondition(root, condition);
@@ -123,13 +134,14 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
    for (i = 0; (i < kids.size()) && (i < SGXmlSound::MAXPROP); i++) {
       _snd_prop volume = {NULL, NULL, NULL, 1.0, 0.0, 0.0, 0.0, false};
 
-      if (strcmp(kids[i]->getStringValue("property"), ""))
-         volume.prop = root->getNode(kids[i]->getStringValue("property", ""), true);
+      propval = kids[i]->getStringValue("property", "");
+      if ( propval != "" )
+         volume.prop = root->getNode(propval, true);
 
-      const char *intern_str = kids[i]->getStringValue("internal", "");
-      if (!strcmp(intern_str, "dt_play"))
+      string intern_str = kids[i]->getStringValue("internal", "");
+      if (intern_str == "dt_play")
          volume.intern = &_dt_play;
-      else if (!strcmp(intern_str, "dt_stop"))
+      else if (intern_str == "dt_stop")
          volume.intern = &_dt_stop;
 
       if ((volume.factor = kids[i]->getDoubleValue("factor", 1.0)) != 0.0)
@@ -138,11 +150,11 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
             volume.subtract = true;
          }
 
-      const char *type_str = kids[i]->getStringValue("type", "");
-      if ( strcmp(type_str, "") ) {
+      string type_str = kids[i]->getStringValue("type", "");
+      if ( type_str != "" ) {
 
          for (int j=0; __sound_fn[j].fn; j++)
-           if ( !strcmp(type_str, __sound_fn[j].name) ) {
+           if ( type_str == __sound_fn[j].name ) {
                volume.fn = __sound_fn[j].fn;
                break;
             }
@@ -168,9 +180,10 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
 
    }
 
-   float reference_dist = node->getDoubleValue("reference-dist", 500.0);
-   float max_dist = node->getDoubleValue("max-dist", 3000.0);
- 
+   // rule of thumb: make reference distance a 100th of the maximum distance.
+   float reference_dist = node->getDoubleValue("reference-dist", 60.0);
+   float max_dist = node->getDoubleValue("max-dist", 6000.0);
+
    //
    // set pitch properties
    //
@@ -179,13 +192,14 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
    for (i = 0; (i < kids.size()) && (i < SGXmlSound::MAXPROP); i++) {
       _snd_prop pitch = {NULL, NULL, NULL, 1.0, 1.0, 0.0, 0.0, false};
 
-      if (strcmp(kids[i]->getStringValue("property", ""), ""))
-         pitch.prop = root->getNode(kids[i]->getStringValue("property", ""), true);
+      propval = kids[i]->getStringValue("property", "");
+      if (propval != "")
+         pitch.prop = root->getNode(propval, true);
 
-      const char *intern_str = kids[i]->getStringValue("internal", "");
-      if (!strcmp(intern_str, "dt_play"))
+      string intern_str = kids[i]->getStringValue("internal", "");
+      if (intern_str == "dt_play")
          pitch.intern = &_dt_play;
-      else if (!strcmp(intern_str, "dt_stop"))
+      else if (intern_str == "dt_stop")
          pitch.intern = &_dt_stop;
 
       if ((pitch.factor = kids[i]->getDoubleValue("factor", 1.0)) != 0.0)
@@ -194,11 +208,11 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
             pitch.subtract = true;
          }
 
-      const char *type_str = kids[i]->getStringValue("type", "");
-      if ( strcmp(type_str, "") ) {
+      string type_str = kids[i]->getStringValue("type", "");
+      if ( type_str != "" ) {
 
          for (int j=0; __sound_fn[j].fn; j++) 
-            if ( !strcmp(type_str, __sound_fn[j].name) ) {
+            if ( type_str == __sound_fn[j].name ) {
                pitch.fn = __sound_fn[j].fn;
                break;
             }
@@ -229,33 +243,42 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
    SGVec3f offset_pos = SGVec3f::zeros();
    SGPropertyNode_ptr prop = node->getChild("position");
    if ( prop != NULL ) {
-       offset_pos[0] = prop->getDoubleValue("x", 0.0);
+       offset_pos[0] = -prop->getDoubleValue("x", 0.0);
        offset_pos[1] = -prop->getDoubleValue("y", 0.0);
-       offset_pos[2] = prop->getDoubleValue("z", 0.0);
+       offset_pos[2] = -prop->getDoubleValue("z", 0.0);
    }
 
    //
    // Orientation
    //
-   SGVec3d dir = SGVec3d::zeros();
+   SGVec3f dir = SGVec3f::zeros();
    float inner = 360.0;
    float outer = 360.0;
    float outer_gain = 0.0;
    prop = node->getChild("orientation");
    if ( prop != NULL ) {
-      dir = SGVec3d(prop->getDoubleValue("y", 0.0),
-                    prop->getDoubleValue("z", 0.0),
-                    prop->getDoubleValue("x", 0.0));
-      inner = prop->getDoubleValue("inner-angle", 360.0);
-      outer = prop->getDoubleValue("outer-angle", 360.0);
-      outer_gain = prop->getDoubleValue("outer-gain", 0.0);
+      dir = SGVec3f(-prop->getFloatValue("x", 0.0),
+                    -prop->getFloatValue("y", 0.0),
+                    -prop->getFloatValue("z", 0.0));
+      inner = prop->getFloatValue("inner-angle", 360.0);
+      outer = prop->getFloatValue("outer-angle", 360.0);
+      outer_gain = prop->getFloatValue("outer-gain", 0.0);
    }
 
    //
    // Initialize the sample
    //
-   _sgrp = sgrp;
-   _sample = new SGSoundSample( path.c_str(), node->getStringValue("path", ""));
+   if (is_avionics) {
+      _sgrp = avionics;
+   } else {
+      _sgrp = sgrp;
+   }
+   string soundFileStr = node->getStringValue("path", "");
+   _sample = new SGSoundSample(soundFileStr.c_str(), currentDir);
+   if (!_sample->file_path().exists()) {
+      throw sg_io_exception("XML sound: couldn't find file: '" + soundFileStr + "'");
+   }
+   
    _sample->set_relative_position( offset_pos );
    _sample->set_direction( dir );
    _sample->set_audio_cone( inner, outer, outer_gain );
@@ -277,6 +300,13 @@ SGXmlSound::update (double dt)
    if (_property)
        curr_value = _property->getDoubleValue();
 
+   if (!_initialized)
+   {
+       // update initial value before detecting changes
+       _prev_value  = curr_value;
+       _initialized = true;
+   }
+
    // If a condition is defined, test whether it is FALSE,
    // else
    //   if a property is defined then test if it's value is FALSE