Weak excuse, but it's getting late. Do clipping right this time.

diff --git a/simgear/sound/xmlsound.cxx b/simgear/sound/xmlsound.cxx
index 83cb5d8628547f0b43c80835e5c703b351a04a72..4e866b85e7f0c76320cc7a9277aef9f585e71f56 100644 (file)
--- a/simgear/sound/xmlsound.cxx
+++ b/simgear/sound/xmlsound.cxx
@@ -406,15 +406,14 @@ SGXmlSound::update (double dt)
    // Change sample state
    //
    _sample->set_pitch( pitch_offset + pitch );
-   _sample->set_volume( volume_offset + volume );
-
    if ((volume_offset + volume ) > 1.0)
    {
       _sample->set_volume( 1.0 );
       SG_LOG(SG_GENERAL, SG_WARN,
-             "WARNING: Volume larger than 1.0 for configuration for '" << _name
-              << "' clipping ...");
-   }
+             "Volume larger than 1.0 in configuration for '" << _name
+              << "', clipping.");
+   } else 
+      _sample->set_volume( volume_offset + volume );
 
 
    //