Use a reference counted pointer for the condition.

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

diff --git a/simgear/sound/xmlsound.cxx b/simgear/sound/xmlsound.cxx
index c4b6523314fa643fbbcee35315e0940542edea6d..474386039fd6147fa66dc128b61edc3476801dd8 100644 (file)
--- a/simgear/sound/xmlsound.cxx
+++ b/simgear/sound/xmlsound.cxx
@@ -47,7 +47,7 @@ static double _snd_log(double v)   { return log(fabs(v)); }
 // static double _snd_pow3(double v)  { return v*v*v; }
 
 static const struct {
-       char *name;
+       const char *name;
        double (*fn)(double);
 } __sound_fn[] = {
 //     {"lin", _snd_lin},
@@ -63,13 +63,13 @@ static const struct {
 
 SGXmlSound::SGXmlSound()
   : _sample(NULL),
-    _condition(NULL),
     _active(false),
     _name(""),
     _mode(SGXmlSound::ONCE),
     _prev_value(0),
     _dt_play(0.0),
     _dt_stop(0.0),
+    _delay(0.0),
     _stopping(0.0)
 {
 }
@@ -79,8 +79,6 @@ SGXmlSound::~SGXmlSound()
     if (_sample)
         _sample->stop();
 
-    delete _condition;
-
     _volume.clear();
     _pitch.clear();
 }
@@ -120,12 +118,14 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr,
       SG_LOG(SG_GENERAL, SG_WARN,
              "  Neither a condition nor a property specified");
 
+   _delay = node->getDoubleValue("delay-sec", 0.0);
+
    //
    // set volume properties
    //
    unsigned int i;
    float v = 0.0;
-   vector<SGPropertyNode_ptr> kids = node->getChildren("volume");
+   std::vector<SGPropertyNode_ptr> kids = node->getChildren("volume");
    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};
 
@@ -272,7 +272,8 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr,
        // "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", "") );
+                                    node->getStringValue("path", ""),
+                                    false );
 
        _mgr->add( _sample, _name );
    }
@@ -325,8 +326,7 @@ SGXmlSound::update (double dt)
    }
 
    //
-   // If the mode is ONCE and the sound is still playing,
-   //  we have nothing to do anymore.
+   // mode is ONCE and the sound is still playing?
    //
    if (_active && (_mode == SGXmlSound::ONCE)) {
 
@@ -337,16 +337,19 @@ SGXmlSound::update (double dt)
          _dt_play += dt;
       }
 
-      return;
+   } else {
+
+      //
+      // Update the playing time, cache the current value and
+      // clear the delay timer.
+      //
+      _dt_play += dt;
+      _prev_value = curr_value;
+      _stopping = 0.0;
    }
 
-   //
-   // Update the playing time, cache the current value and
-   // clear the delay timer.
-   //
-   _dt_play += dt;
-   _prev_value = curr_value;
-   _stopping = 0.0;
+   if (_dt_play < _delay)
+      return;
 
    //
    // Update the volume
@@ -424,15 +427,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 );
 
 
    //