Clip to volume to 1.0 if necessary.

diff --git a/simgear/sound/xmlsound.cxx b/simgear/sound/xmlsound.cxx
index 09e2eb0410c5644e55109dc547c674bc3a380726..83cb5d8628547f0b43c80835e5c703b351a04a72 100644 (file)
--- a/simgear/sound/xmlsound.cxx
+++ b/simgear/sound/xmlsound.cxx
@@ -408,12 +408,13 @@ SGXmlSound::update (double dt)
    _sample->set_pitch( pitch_offset + pitch );
    _sample->set_volume( volume_offset + volume );
 
-#if 0
-   if ((pitch_offset + pitch) > 2.0)
-      cout << "WARNING: Pitch higher than 2.0 for configuration for '" << _name << "'"<< endl;
-#endif
    if ((volume_offset + volume ) > 1.0)
-      cout << "WARNING: Volume larger than 1.0 for configuration for '" << _name << "'" << endl;
+   {
+      _sample->set_volume( 1.0 );
+      SG_LOG(SG_GENERAL, SG_WARN,
+             "WARNING: Volume larger than 1.0 for configuration for '" << _name
+              << "' clipping ...");
+   }
 
 
    //