Add a HLADataElementVisitor implementation.

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

diff --git a/simgear/sound/xmlsound.cxx b/simgear/sound/xmlsound.cxx
index 2a3cbfac3adb5613da0f538ecbb6b8a40515d99c..f3471d4ef0c2c9cfdf2d1b2203f34b8eb071c9e2 100644 (file)
--- a/simgear/sound/xmlsound.cxx
+++ b/simgear/sound/xmlsound.cxx
@@ -30,9 +30,11 @@
 #include <string.h>
 
 #include <simgear/debug/logstream.hxx>
+#include <simgear/props/props.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 +69,8 @@ SGXmlSound::SGXmlSound()
     _dt_play(0.0),
     _dt_stop(0.0),
     _delay(0.0),
-    _stopping(0.0)
+    _stopping(0.0),
+    _initialized(false)
 {
 }
 
@@ -83,7 +86,7 @@ SGXmlSound::~SGXmlSound()
 void
 SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
                  SGSampleGroup *sgrp, SGSampleGroup *avionics,
-                 const string &path)
+                 const SGPath& currentDir)
 {
 
    //
@@ -93,11 +96,11 @@ 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 {
@@ -105,8 +108,8 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
    }
 
    bool is_avionics = false;
-   const char *type_str = node->getStringValue("type", "fx");
-   if ( !strcmp(type_str, "avionics") )
+   string type_str = node->getStringValue("type", "fx");
+   if ( type_str == "avionics" )
       is_avionics = true;
 
    string propval = node->getStringValue("property", "");
@@ -132,13 +135,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)
@@ -147,11 +151,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;
             }
@@ -189,13 +193,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)
@@ -204,11 +209,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;
             }
@@ -269,7 +274,12 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
    } else {
       _sgrp = sgrp;
    }
-   _sample = new SGSoundSample( path.c_str(), node->getStringValue("path", ""));
+   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 );
@@ -291,6 +301,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