Rename update() to update_late() for the sound manager to be able to initialize it...

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

diff --git a/simgear/sound/xmlsound.cxx b/simgear/sound/xmlsound.cxx
index 5d6490b99a74afee4c47470ff407ed3ed66a6c28..919f08371669b9f8871db20178b09d7a05fac0f7 100644 (file)
--- a/simgear/sound/xmlsound.cxx
+++ b/simgear/sound/xmlsound.cxx
@@ -47,23 +47,19 @@ 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},
        {"inv", _snd_inv},
        {"abs", _snd_abs},
        {"sqrt", _snd_sqrt},
        {"log", _snd_log10},
        {"ln", _snd_log},
-//     {"sqr", _snd_sqr},
-//     {"pow3", _snd_pow3},
        {"", NULL}
 };
 
 SGXmlSound::SGXmlSound()
   : _sample(NULL),
-    _condition(NULL),
     _active(false),
     _name(""),
     _mode(SGXmlSound::ONCE),
@@ -80,23 +76,21 @@ SGXmlSound::~SGXmlSound()
     if (_sample)
         _sample->stop();
 
-    delete _condition;
-
     _volume.clear();
     _pitch.clear();
 }
 
 void
-SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr,
-                 const string &path)
+SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
+                 SGSampleGroup *sgrp, const string &path)
 {
 
    //
    // set global sound properties
    //
-   
+
    _name = node->getStringValue("name", "");
-   SG_LOG(SG_GENERAL, SG_INFO, "Loading sound information for: " << _name );
+   SG_LOG(SG_GENERAL, SG_DEBUG, "Loading sound information for: " << _name );
 
    const char *mode_str = node->getStringValue("mode", "");
    if ( !strcmp(mode_str, "looped") ) {
@@ -109,7 +103,7 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr,
       _mode = SGXmlSound::ONCE;
 
       if ( strcmp(mode_str, "") )
-         SG_LOG(SG_GENERAL,SG_INFO, "  Unknown sound mode, default to 'once'");
+         SG_LOG(SG_GENERAL,SG_INFO, "Unknown sound mode for '" << _name << "', default to 'once'");
    }
 
    _property = root->getNode(node->getStringValue("property", ""), true);
@@ -128,7 +122,7 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr,
    //
    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};
 
@@ -235,8 +229,7 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr,
    //
    // Relative position
    //
-   sgVec3 offset_pos;
-   sgSetVec3( offset_pos, 0.0, 0.0, 0.0 );
+   SGVec3f offset_pos = SGVec3f::zeros();
    SGPropertyNode_ptr pos = node->getChild("position");
    if ( pos != NULL ) {
        offset_pos[0] = pos->getDoubleValue("x", 0.0);
@@ -247,9 +240,8 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr,
    //
    // Orientation
    //
-   sgVec3 dir;
+   SGVec3f dir = SGVec3f::zeros();
    float inner, outer, outer_gain;
-   sgSetVec3( dir, 0.0, 0.0, 0.0 );
    inner = outer = 360.0;
    outer_gain = 0.0;
    pos = node->getChild("orientation");
@@ -265,8 +257,8 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr,
    //
    // Initialize the sample
    //
-   _mgr = sndmgr;
-   if ( (_sample = _mgr->find(_name)) == NULL ) {
+   _sgrp = sgrp;
+   if ( (_sample = _sgrp->find(_name)) == NULL ) {
        // 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
@@ -275,17 +267,16 @@ 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", ""),
-                                    false );
-
-       _mgr->add( _sample, _name );
+                                    node->getStringValue("path", "") );
+       _sgrp->add( _sample, _name );
    }
 
-   _sample->set_offset_pos( offset_pos );
-   _sample->set_orientation(dir, inner, outer, outer_gain);
-   _sample->set_volume(v);
+   _sample->set_relative_position( offset_pos );
+   _sample->set_orientation( dir );
+   _sample->set_audio_cone(inner, outer, outer_gain);
    _sample->set_reference_dist( reference_dist );
    _sample->set_max_dist( max_dist );
+   _sample->set_volume(v);
    _sample->set_pitch(p);
 }
 
@@ -300,6 +291,11 @@ SGXmlSound::update (double dt)
    if (_property)
        curr_value = _property->getDoubleValue();
 
+   // If a condition is defined, test whether it is FALSE,
+   // else
+   //   if a property is defined then test if it's value is FALSE
+   //      or if the mode is IN_TRANSIT then
+   //            test whether the current value matches the previous value.
    if (                                                        // Lisp, anyone?
        (_condition && !_condition->test()) ||
        (!_condition && _property &&
@@ -310,9 +306,10 @@ SGXmlSound::update (double dt)
         )
        )
    {
-       if ((_mode != SGXmlSound::IN_TRANSIT) || (_stopping > MAX_TRANSIT_TIME)) {
+       if ((_mode != SGXmlSound::IN_TRANSIT) || (_stopping > MAX_TRANSIT_TIME))
+       {
            if (_sample->is_playing()) {
-               SG_LOG(SG_GENERAL, SG_INFO, "Stopping audio after " << _dt_play
+               SG_LOG(SG_GENERAL, SG_DEBUG, "Stopping audio after " << _dt_play
                       << " sec: " << _name );
 
                _sample->stop();
@@ -433,7 +430,7 @@ SGXmlSound::update (double dt)
 
    double vol = volume_offset + volume;
    if (vol > 1.0) {
-      SG_LOG(SG_GENERAL, SG_WARN, "Sound volume too large for '"
+      SG_LOG(SG_GENERAL, SG_DEBUG, "Sound volume too large for '"
               << _name << "':  " << vol << "  ->  clipping to 1.0");
       vol = 1.0;
    }
@@ -452,9 +449,9 @@ SGXmlSound::update (double dt)
       else
          _sample->play(true);
 
-      SG_LOG(SG_GENERAL, SG_INFO, "Playing audio after " << _dt_stop 
+      SG_LOG(SG_GENERAL, SG_DEBUG, "Playing audio after " << _dt_stop 
                                    << " sec: " << _name);
-      SG_LOG(SG_GENERAL, SG_BULK,
+      SG_LOG(SG_GENERAL, SG_DEBUG,
                          "Playing " << ((_mode == ONCE) ? "once" : "looped"));
 
       _active = true;