// 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},
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)
{
}
if (_sample)
_sample->stop();
- delete _condition;
-
_volume.clear();
_pitch.clear();
}
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};
// "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 );
}
}
//
- // 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)) {
_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