Logging - downgrade play/stop messages to debug.

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

diff --git a/simgear/sound/xmlsound.cxx b/simgear/sound/xmlsound.cxx
index 18850f84b866a1fc38a7bb7e788be45cc6eb6358..529b84c761ecb2aea975ab84f1dac18e61f8c0cb 100644 (file)
--- a/simgear/sound/xmlsound.cxx
+++ b/simgear/sound/xmlsound.cxx
@@ -63,7 +63,6 @@ static const struct {
 
 SGXmlSound::SGXmlSound()
   : _sample(NULL),
-    _condition(NULL),
     _active(false),
     _name(""),
     _mode(SGXmlSound::ONCE),
@@ -80,8 +79,6 @@ SGXmlSound::~SGXmlSound()
     if (_sample)
         _sample->stop();
 
-    delete _condition;
-
     _volume.clear();
     _pitch.clear();
 }
@@ -94,6 +91,10 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr,
    //
    // set global sound properties
    //
+
+   if (sndmgr->is_working() == false) {
+       return;
+   }
    
    _name = node->getStringValue("name", "");
    SG_LOG(SG_GENERAL, SG_INFO, "Loading sound information for: " << _name );
@@ -300,6 +301,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 &&
@@ -312,7 +318,7 @@ SGXmlSound::update (double dt)
    {
        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 +439,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 +458,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;